flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject flink git commit: [hotfix] respect default local number of task managers
Date Tue, 15 Dec 2015 17:37:01 GMT
Repository: flink
Updated Branches:
  refs/heads/master e20c6390d -> e24861886


[hotfix] respect default local number of task managers


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

Branch: refs/heads/master
Commit: e2486188610ca30f0f26c0c0f061d3349a5dc6f3
Parents: e20c639
Author: Maximilian Michels <mxm@apache.org>
Authored: Thu Dec 10 16:04:31 2015 +0100
Committer: Maximilian Michels <mxm@apache.org>
Committed: Tue Dec 15 18:35:42 2015 +0100

----------------------------------------------------------------------
 .../apache/flink/runtime/executiongraph/ExecutionGraph.java    | 2 +-
 .../flink/runtime/minicluster/LocalFlinkMiniCluster.scala      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/e2486188/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
index 9218fe4..1e3a4eb 100755
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
@@ -1074,7 +1074,7 @@ public class ExecutionGraph implements Serializable {
 				LOG.warn("Received accumulator result for unknown execution {}.", execID);
 			}
 		} catch (Exception e) {
-			LOG.error("Cannot update accumulators for job " + jobID, e);
+			LOG.error("Cannot update accumulators for job {}.", jobID, e);
 		}
 	}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e2486188/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
index a27c840..913aec0 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
@@ -158,7 +158,8 @@ class LocalFlinkMiniCluster(
         ConfigConstants.DEFAULT_TASK_MANAGER_NETWORK_NUM_BUFFERS) * bufferSize.toLong
 
       val numTaskManager = config.getInteger(
-        ConfigConstants.LOCAL_NUMBER_TASK_MANAGER, 1)
+        ConfigConstants.LOCAL_NUMBER_TASK_MANAGER,
+        ConfigConstants.DEFAULT_LOCAL_NUMBER_TASK_MANAGER)
 
       val memoryFraction = config.getFloat(
         ConfigConstants.TASK_MANAGER_MEMORY_FRACTION_KEY,
@@ -184,7 +185,8 @@ class LocalFlinkMiniCluster(
 
     config.setString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, hostname)
 
-    config.setInteger(ConfigConstants.LOCAL_NUMBER_TASK_MANAGER, 1)
+    config.setInteger(ConfigConstants.LOCAL_NUMBER_TASK_MANAGER,
+      ConfigConstants.DEFAULT_LOCAL_NUMBER_TASK_MANAGER)
 
     // Reduce number of threads for local execution
     config.setInteger(NettyConfig.NUM_THREADS_CLIENT, 1)


Mime
View raw message