You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2015/08/12 18:50:24 UTC
flink git commit: [hotfix] read from old and new parallelism config
key
Repository: flink
Updated Branches:
refs/heads/master a41bc8cc1 -> 7349ef815
[hotfix] read from old and new parallelism config key
regression of c6358024454cd8225cf27a91db7f64ffa13189ee
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7349ef81
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7349ef81
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7349ef81
Branch: refs/heads/master
Commit: 7349ef815e8625efaa6d2722fbe583d4c6067f1a
Parents: a41bc8c
Author: Maximilian Michels <mx...@apache.org>
Authored: Wed Aug 12 18:10:41 2015 +0200
Committer: Maximilian Michels <mx...@apache.org>
Committed: Wed Aug 12 18:15:52 2015 +0200
----------------------------------------------------------------------
.../flink/streaming/api/environment/StreamContextEnvironment.java | 2 +-
.../flink/streaming/api/environment/StreamPlanEnvironment.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7349ef81/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
index 5240f65..9bfeb2f 100644
--- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
+++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
@@ -47,7 +47,7 @@ public class StreamContextEnvironment extends StreamExecutionEnvironment {
} else {
// first check for old parallelism config key
setParallelism(GlobalConfiguration.getInteger(
- ConfigConstants.DEFAULT_PARALLELISM_KEY,
+ ConfigConstants.DEFAULT_PARALLELISM_KEY_OLD,
ConfigConstants.DEFAULT_PARALLELISM));
// then for new
setParallelism(GlobalConfiguration.getInteger(
http://git-wip-us.apache.org/repos/asf/flink/blob/7349ef81/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
index 9b6b933..02fccd0 100644
--- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
+++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
@@ -39,7 +39,7 @@ public class StreamPlanEnvironment extends StreamExecutionEnvironment {
} else {
// first check for old parallelism config key
setParallelism(GlobalConfiguration.getInteger(
- ConfigConstants.DEFAULT_PARALLELISM_KEY,
+ ConfigConstants.DEFAULT_PARALLELISM_KEY_OLD,
ConfigConstants.DEFAULT_PARALLELISM));
// then for new
setParallelism(GlobalConfiguration.getInteger(