[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/c6954a94 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c6954a94 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c6954a94 Branch: refs/heads/flip-6 Commit: c6954a948eab9561bce58992159674750b2f53e7 Parents: 485ef00 Author: Maximilian Michels <m...@apache.org> Authored: Thu Sep 22 13:56:00 2016 +0200 Committer: Stephan Ewen <se...@apache.org> Committed: Fri Oct 14 15:14:41 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/c6954a94/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);
