diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index d287b45..a4c8f27 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -2955,7 +2955,7 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "executed in parallel.", "llap.daemon.num.executors"), LLAP_DAEMON_RPC_PORT("hive.llap.daemon.rpc.port", 15001, "The LLAP daemon RPC port.", "llap.daemon.rpc.port"), - LLAP_DAEMON_MEMORY_PER_INSTANCE_MB("hive.llap.daemon.memory.per.instance.mb", 4096, + LLAP_DAEMON_MEMORY_PER_INSTANCE_MB("hive.llap.daemon.memory.per.instance.mb", 3276, "The total amount of memory to use for the executors inside LLAP (in megabytes).", "llap.daemon.memory.per.instance.mb"), LLAP_DAEMON_VCPUS_PER_INSTANCE("hive.llap.daemon.vcpus.per.instance", 4, diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/ContainerRunnerImpl.java llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/ContainerRunnerImpl.java index a9031fd..91a321d 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/ContainerRunnerImpl.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/ContainerRunnerImpl.java @@ -129,9 +129,8 @@ public ContainerRunnerImpl(Configuration conf, int numExecutors, int waitQueueSi addIfService(executorService); - // 80% of memory considered for accounted buffers. Rest for objects. - // TODO Tune this based on the available size. - this.memoryPerExecutor = (long)(totalMemoryAvailableBytes * 0.8 / (float) numExecutors); + // Distribute the available memory between the tasks. + this.memoryPerExecutor = (long)(totalMemoryAvailableBytes / (float) numExecutors); this.metrics = metrics; confParams = new TaskRunnerCallable.ConfParams(