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

[flink] 03/24: [hotfix] Fix setting CoreOptions.DEFAULT_PARALLELISM in ExecutionConfigAccessor

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

kkloudas pushed a commit to branch executors
in repository https://gitbox.apache.org/repos/asf/flink.git

commit c33db7dc22c2bb2a53a88d9bb0c74432d18ba7d4
Author: Kostas Kloudas <kk...@gmail.com>
AuthorDate: Fri Nov 1 14:33:10 2019 +0100

    [hotfix] Fix setting CoreOptions.DEFAULT_PARALLELISM in ExecutionConfigAccessor
---
 .../java/org/apache/flink/client/cli/ExecutionConfigAccessor.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java b/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java
index 9355038..abdf685 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java
@@ -19,6 +19,7 @@
 package org.apache.flink.client.cli;
 
 import org.apache.flink.annotation.Internal;
+import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.CoreOptions;
 import org.apache.flink.configuration.ExecutionOptions;
@@ -59,7 +60,11 @@ public class ExecutionConfigAccessor {
 		checkNotNull(options);
 
 		final Configuration configuration = new Configuration();
-		configuration.setInteger(CoreOptions.DEFAULT_PARALLELISM, options.getParallelism());
+
+		if (options.getParallelism() != ExecutionConfig.PARALLELISM_DEFAULT) {
+			configuration.setInteger(CoreOptions.DEFAULT_PARALLELISM, options.getParallelism());
+		}
+
 		configuration.setBoolean(ExecutionOptions.ATTACHED, !options.getDetachedMode());
 		configuration.setBoolean(ExecutionOptions.SHUTDOWN_IF_ATTACHED, options.isShutdownOnAttachedExit());