You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by az...@apache.org on 2019/11/07 21:56:09 UTC

[flink] 18/21: fix YarnConfigurationITCase

This is an automated email from the ASF dual-hosted git repository.

azagrebin pushed a commit to branch FLINK-13986-flip49-cleanup-e2e
in repository https://gitbox.apache.org/repos/asf/flink.git

commit d123baf24e68ba7058bbb739954a59879bf5265d
Author: Andrey Zagrebin <az...@apache.org>
AuthorDate: Tue Nov 5 09:14:50 2019 +0100

    fix YarnConfigurationITCase
---
 .../src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java    | 2 +-
 .../src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
index 8350293..dbad597 100644
--- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
+++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
@@ -85,7 +85,7 @@ public class YarnConfigurationITCase extends YarnTestBase {
 			final Configuration configuration = new Configuration(flinkConfiguration);
 
 			final int masterMemory = 64;
-			final int taskManagerMemory = 128;
+			final int taskManagerMemory = 512;
 			final int slotsPerTaskManager = 3;
 
 			// disable heap cutoff min
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
index f958b70..74207ff 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
@@ -835,7 +835,7 @@ public class YarnClusterDescriptor implements ClusterDescriptor<ApplicationId> {
 				clusterSpecification.getSlotsPerTaskManager());
 
 		configuration.setString(
-				TaskManagerOptions.TASK_MANAGER_HEAP_MEMORY,
+				TaskManagerOptions.TOTAL_PROCESS_MEMORY,
 				clusterSpecification.getTaskManagerMemoryMB() + "m");
 
 		// Upload the flink configuration