flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [1/7] flink git commit: [FLINK-8812] [flip6] Set managed memory for TaskExecutor to 80 MB in MiniCluster
Date Sun, 18 Mar 2018 17:58:35 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.5 c74f80869 -> 341a3fd8e


[FLINK-8812] [flip6] Set managed memory for TaskExecutor to 80 MB in MiniCluster

In order to avoid problems with OOM exceptions, this commit sets the managed
memory to 80 MB for TaskExecutors started by the MiniCluster.

This closes #5713.


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

Branch: refs/heads/release-1.5
Commit: d3b83a9da854b73b42ce68f78f46a8a11c510914
Parents: c2dd43e
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Sat Mar 17 17:53:35 2018 +0100
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Sun Mar 18 18:55:19 2018 +0100

----------------------------------------------------------------------
 .../java/org/apache/flink/test/util/MiniClusterResource.java    | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/d3b83a9d/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
index 2f12bdc..dbd292c 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
@@ -26,6 +26,7 @@ import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.CoreOptions;
 import org.apache.flink.configuration.RestOptions;
+import org.apache.flink.configuration.TaskManagerOptions;
 import org.apache.flink.runtime.akka.AkkaUtils;
 import org.apache.flink.runtime.minicluster.JobExecutorService;
 import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster;
@@ -194,6 +195,10 @@ public class MiniClusterResource extends ExternalResource {
 			configuration.setBoolean(CoreOptions.FILESYTEM_DEFAULT_OVERRIDE, true);
 		}
 
+		if (!configuration.contains(TaskManagerOptions.MANAGED_MEMORY_SIZE)) {
+			configuration.setLong(TaskManagerOptions.MANAGED_MEMORY_SIZE, TestBaseUtils.TASK_MANAGER_MEMORY_SIZE);
+		}
+
 		// set rest port to 0 to avoid clashes with concurrent MiniClusters
 		configuration.setInteger(RestOptions.REST_PORT, 0);
 


Mime
View raw message