flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [34/63] [abbrv] git commit: Fix race at TaskManager registration during startup
Date Sun, 21 Sep 2014 02:12:58 GMT
Fix race at TaskManager registration during startup


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

Branch: refs/heads/master
Commit: ef7957f008f98491c3c525a224fec9107dca9179
Parents: 8998a30
Author: Stephan Ewen <sewen@apache.org>
Authored: Mon Sep 15 16:52:48 2014 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Sat Sep 20 20:02:49 2014 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/flink/runtime/jobmanager/JobManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/ef7957f0/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
index 113f8fd..f79fecb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
@@ -661,7 +661,7 @@ public class JobManager implements ExtendedManagementProtocol, InputSplitProvide
 
 	@Override
 	public InstanceID registerTaskManager(InstanceConnectionInfo instanceConnectionInfo, HardwareDescription
hardwareDescription, int numberOfSlots) {
-		if (this.instanceManager != null) {
+		if (this.instanceManager != null && this.scheduler != null) {
 			return this.instanceManager.registerTaskManager(instanceConnectionInfo, hardwareDescription,
numberOfSlots);
 		} else {
 			return null;


Mime
View raw message