Repository: hive Updated Branches: refs/heads/llap 61cfda9c3 -> 583012552
HIVE-11003: LLAP: Fix LLAP startup issues due to heap rounding errors (gopalv) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/58301255 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/58301255 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/58301255 Branch: refs/heads/llap Commit: 5830125526d5f93a5df3a6112afa25f5477d2853 Parents: 61cfda9 Author: Gopal V <[email protected]> Authored: Sun Jun 14 16:58:09 2015 -0700 Committer: Gopal V <[email protected]> Committed: Sun Jun 14 16:58:09 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java | 3 ++- llap-server/src/main/resources/package.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/58301255/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java index 1801212..7959945 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java @@ -195,7 +195,6 @@ public class LlapDaemon extends CompositeService implements ContainerRunner, Lla // in the usable space. long total = 0; - MemoryMXBean m = ManagementFactory.getMemoryMXBean(); for (MemoryPoolMXBean mp : ManagementFactory.getMemoryPoolMXBeans()) { long sz = mp.getUsage().getMax(); if (mp.getName().contains("Survivor")) { @@ -205,6 +204,8 @@ public class LlapDaemon extends CompositeService implements ContainerRunner, Lla total += sz; } } + // round up to the next MB + total += (total % (1024*1024)); return total; } http://git-wip-us.apache.org/repos/asf/hive/blob/58301255/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 ae501cf..f410730 100644 --- a/llap-server/src/main/resources/package.py +++ b/llap-server/src/main/resources/package.py @@ -33,7 +33,7 @@ class LlapResource(object): else: # do not mess with user input c = size - self.container_size = size + self.container_size = c self.container_cores = self.cores self.heap_size = h
