You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ga...@apache.org on 2015/09/10 23:49:12 UTC
[1/3] incubator-apex-core git commit: APEX-101 #resolve store memory
allocated in megabytes instead of bytes
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 <da...@datatorrent.com>
Authored: Wed Sep 9 18:18:29 2015 -0700
Committer: David Yan <da...@datatorrent.com>
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;
[2/3] incubator-apex-core git commit: Merge branch 'APEX-101-rel-3.1'
of github.com:davidyan74/incubator-apex-core into davidyan74-APEX-101-rel-3.1
Posted by ga...@apache.org.
Merge branch 'APEX-101-rel-3.1' of github.com:davidyan74/incubator-apex-core into davidyan74-APEX-101-rel-3.1
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/847150f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/847150f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/847150f9
Branch: refs/heads/release-3.1
Commit: 847150f90b588f6546e54fa3453bb6dcdc5cf650
Parents: 35983c3 53b9b86
Author: Gaurav Gupta <ga...@apache.org>
Authored: Thu Sep 10 14:48:30 2015 -0700
Committer: Gaurav Gupta <ga...@apache.org>
Committed: Thu Sep 10 14:48:30 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/stram/StreamingContainerManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-apex-core git commit: Merge branch
'davidyan74-APEX-101-rel-3.1' into release-3.1
Posted by ga...@apache.org.
Merge branch 'davidyan74-APEX-101-rel-3.1' into release-3.1
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/4ec5e763
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/4ec5e763
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/4ec5e763
Branch: refs/heads/release-3.1
Commit: 4ec5e7637b40db906a50f879fe1cf3ae1d68ffe3
Parents: 35983c3 847150f
Author: Gaurav Gupta <ga...@apache.org>
Authored: Thu Sep 10 14:48:51 2015 -0700
Committer: Gaurav Gupta <ga...@apache.org>
Committed: Thu Sep 10 14:48:51 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/stram/StreamingContainerManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------