Repository: incubator-apex-core Updated Branches: refs/heads/release-3.1 35983c3c2 -> 4ec5e7637
APEX-101 #resolve store memory allocated in megabytes instead of bytes Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/53b9b86d Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/53b9b86d Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/53b9b86d Branch: refs/heads/release-3.1 Commit: 53b9b86d4e6fa856a576cc4cfcf902a7451b08cb Parents: 6bdbb15 Author: David Yan <[email protected]> Authored: Wed Sep 9 18:18:29 2015 -0700 Committer: David Yan <[email protected]> Committed: Thu Sep 10 14:24:19 2015 -0700 ---------------------------------------------------------------------- .../com/datatorrent/stram/StreamingContainerManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/53b9b86d/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java index 7002c1d..644734d 100644 --- a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java +++ b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java @@ -173,7 +173,7 @@ public class StreamingContainerManager implements PlanContext private long completeEndWindowStatsWindowId; private final ConcurrentHashMap<String, MovingAverageLong> rpcLatencies = new ConcurrentHashMap<String, MovingAverageLong>(); private final AtomicLong nodeToStramRequestIds = new AtomicLong(1); - private long allocatedMemoryBytes = 0; + private int allocatedMemoryMB = 0; private List<AppDataSource> appDataSources = null; private final Cache<Long, Object> commandResponse = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(); private long lastLatencyWarningTime; @@ -394,7 +394,7 @@ public class StreamingContainerManager implements PlanContext } if (nmHttpPort != null) { String nodeHttpAddress = nmHost + ":" + nmHttpPort; - if (allocatedMemoryBytes == 0) { + if (allocatedMemoryMB == 0) { String url = ConfigUtils.getSchemePrefix(conf) + nodeHttpAddress + "/ws/v1/node/containers/" + ci.id; WebServicesClient webServicesClient = new WebServicesClient(); try { @@ -402,7 +402,7 @@ public class StreamingContainerManager implements PlanContext JSONObject json = new JSONObject(content); int totalMemoryNeededMB = json.getJSONObject("container").getInt("totalMemoryNeededMB"); if (totalMemoryNeededMB > 0) { - allocatedMemoryBytes = totalMemoryNeededMB * 1024 * 1024; + allocatedMemoryMB = totalMemoryNeededMB; } else { LOG.warn("Could not determine the memory allocated for the streaming application master. Node manager is reporting {} MB from {}", totalMemoryNeededMB, url); } @@ -415,7 +415,7 @@ public class StreamingContainerManager implements PlanContext ci.rawContainerLogsUrl = ConfigUtils.getRawContainerLogsUrl(conf, nodeHttpAddress, plan.getLogicalPlan().getAttributes().get(LogicalPlan.APPLICATION_ID), ci.id); } } - ci.memoryMBAllocated = (int)(allocatedMemoryBytes / (1024 * 1024)); + ci.memoryMBAllocated = allocatedMemoryMB; ci.memoryMBFree = ((int)(Runtime.getRuntime().freeMemory() / (1024 * 1024))); ci.lastHeartbeat = -1; ci.startedTime = startTime;
