flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [4/4] git commit: Fix simple error in local execution memory estimation
Date Sun, 29 Jun 2014 14:35:20 GMT
Fix simple error in local execution memory estimation


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/d76d1b0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/d76d1b0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/d76d1b0d

Branch: refs/heads/master
Commit: d76d1b0dcd60bbfea168368621a4a46a4f077c4a
Parents: c3f8809
Author: Stephan Ewen <sewen@apache.org>
Authored: Sun Jun 29 01:21:42 2014 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Sun Jun 29 01:21:42 2014 +0200

----------------------------------------------------------------------
 .../eu/stratosphere/client/minicluster/NepheleMiniCluster.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d76d1b0d/stratosphere-clients/src/main/java/eu/stratosphere/client/minicluster/NepheleMiniCluster.java
----------------------------------------------------------------------
diff --git a/stratosphere-clients/src/main/java/eu/stratosphere/client/minicluster/NepheleMiniCluster.java
b/stratosphere-clients/src/main/java/eu/stratosphere/client/minicluster/NepheleMiniCluster.java
index 76ee1f9..83b1621 100644
--- a/stratosphere-clients/src/main/java/eu/stratosphere/client/minicluster/NepheleMiniCluster.java
+++ b/stratosphere-clients/src/main/java/eu/stratosphere/client/minicluster/NepheleMiniCluster.java
@@ -282,7 +282,7 @@ public class NepheleMiniCluster {
 					GlobalConfiguration.getLong(ConfigConstants.TASK_MANAGER_NETWORK_BUFFER_SIZE_KEY,
 							ConfigConstants.DEFAULT_TASK_MANAGER_NETWORK_BUFFER_SIZE);
 
-			memorySize = memorySize - bufferMem;
+			memorySize = memorySize - (bufferMem * numTaskManager);
 			
 			// apply the fraction that makes sure memory is left to the heap for other data structures
and UDFs.
 			memorySize = (long) (memorySize * ConfigConstants.DEFAULT_MEMORY_MANAGER_MEMORY_FRACTION);


Mime
View raw message