You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/05/26 22:17:15 UTC

flink git commit: [tez] Fix initialization of MemoryManager.

Repository: flink
Updated Branches:
  refs/heads/master 49631dc17 -> b68049b7d


[tez] Fix initialization of MemoryManager.

This closes #728


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

Branch: refs/heads/master
Commit: b68049b7d75dcb52420d4d79728e68c94f838fc2
Parents: 49631dc
Author: Stephan Ewen <se...@apache.org>
Authored: Tue May 26 16:45:22 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue May 26 22:15:42 2015 +0200

----------------------------------------------------------------------
 .../org/apache/flink/tez/runtime/TezRuntimeEnvironment.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/b68049b7/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java b/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java
index 4cf855a..889255c 100644
--- a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java
+++ b/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java
@@ -27,16 +27,13 @@ import org.apache.flink.runtime.memorymanager.MemoryManager;
 public class TezRuntimeEnvironment {
 
 	private static int DEFAULT_PAGE_SIZE = 32768;
-	private static int DEFAULT_NUM_SLOTS = 10;
 
 	private final IOManager ioManager;
 
 	private final MemoryManager memoryManager;
 
 	public TezRuntimeEnvironment(long totalMemory) {
-		int pageSize = DEFAULT_PAGE_SIZE;
-		int numSlots = DEFAULT_NUM_SLOTS;
-		this.memoryManager = new DefaultMemoryManager(totalMemory, numSlots, pageSize, true);
+		this.memoryManager = new DefaultMemoryManager(totalMemory, 1, DefaultMemoryManager.DEFAULT_PAGE_SIZE, true);
 		this.ioManager = new IOManagerAsync();
 	}