Repository: hive Updated Branches: refs/heads/master fec0c1fab -> 5cd5aae3c
HIVE-13656 : need to set direct memory limit higher in LlapServiceDriver for certain edge case configurations (Sergey Shelukhin, reviewed by Vikram Dixit K) ADDENDUM Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5cd5aae3 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5cd5aae3 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5cd5aae3 Branch: refs/heads/master Commit: 5cd5aae3c4026c30f741760153352e1b6ce3ee90 Parents: fec0c1f Author: Sergey Shelukhin <[email protected]> Authored: Fri May 13 14:42:55 2016 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Fri May 13 14:42:55 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java | 7 ++++--- llap-server/src/main/resources/package.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/5cd5aae3/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java index 6239842..c8fddb1 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java @@ -248,10 +248,11 @@ public class LlapServiceDriver { // Needs more explanation here // Xmx is not the max heap value in JDK8. You need to subtract 50% of the survivor fraction // from this, to get actual usable memory before it goes into GC - xmx = (long) (options.getXmx() / (1024 * 1024)); - conf.setLong(ConfVars.LLAP_DAEMON_MEMORY_PER_INSTANCE_MB.varname, xmx); + xmx = options.getXmx(); + long xmxMb = (long)(xmx / (1024 * 1024)); + conf.setLong(ConfVars.LLAP_DAEMON_MEMORY_PER_INSTANCE_MB.varname, xmxMb); propsDirectOptions.setProperty(ConfVars.LLAP_DAEMON_MEMORY_PER_INSTANCE_MB.varname, - String.valueOf(xmx)); + String.valueOf(xmxMb)); } if (options.getLlapQueueName() != null && !options.getLlapQueueName().isEmpty()) { http://git-wip-us.apache.org/repos/asf/hive/blob/5cd5aae3/llap-server/src/main/resources/package.py ---------------------------------------------------------------------- diff --git a/llap-server/src/main/resources/package.py b/llap-server/src/main/resources/package.py index 94c9d1a..83fe918 100644 --- a/llap-server/src/main/resources/package.py +++ b/llap-server/src/main/resources/package.py @@ -103,7 +103,7 @@ def main(args): java_home = config["java.home"] max_direct_memory = config["max_direct_memory"] daemon_args = args.args - if max_direct_memory > 0: + if long(max_direct_memory) > 0: daemon_args = " -XX:MaxDirectMemorySize=%s %s" % (max_direct_memory, daemon_args) resource = LlapResource(config) # 5% container failure every monkey_interval seconds
