You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2016/10/06 11:48:52 UTC
[32/50] [abbrv] flink git commit: [hotfix] fix ResourceManagerGateway
[hotfix] fix ResourceManagerGateway
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/71ed1c92
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/71ed1c92
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/71ed1c92
Branch: refs/heads/flip-6
Commit: 71ed1c92bbb254f1c1a49b149ab41859b4ab7236
Parents: 6da891f
Author: Maximilian Michels <mx...@apache.org>
Authored: Thu Sep 22 13:56:00 2016 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Thu Oct 6 13:38:43 2016 +0200
----------------------------------------------------------------------
.../flink/runtime/resourcemanager/ResourceManagerGateway.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/71ed1c92/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
index d8b8ebe..484cea7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
@@ -27,7 +27,6 @@ import org.apache.flink.runtime.rpc.RpcTimeout;
import org.apache.flink.runtime.jobmaster.JobMaster;
import org.apache.flink.runtime.registration.RegistrationResponse;
-import org.apache.flink.runtime.registration.RegistrationResponse;
import java.util.UUID;
/**
@@ -39,6 +38,7 @@ public interface ResourceManagerGateway extends RpcGateway {
* Register a {@link JobMaster} at the resource manager.
*
* @param resourceManagerLeaderId The fencing token for the ResourceManager leader
+ * @param jobMasterLeaderId The fencing token for the JobMaster leader
* @param jobMasterAddress The address of the JobMaster that registers
* @param jobID The Job ID of the JobMaster that registers
* @param timeout Timeout for the future to complete
@@ -46,6 +46,7 @@ public interface ResourceManagerGateway extends RpcGateway {
*/
Future<RegistrationResponse> registerJobMaster(
UUID resourceManagerLeaderId,
+ UUID jobMasterLeaderId,
String jobMasterAddress,
JobID jobID,
@RpcTimeout Time timeout);