Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5AD27200B96 for ; Thu, 6 Oct 2016 13:48:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 59901160AAD; Thu, 6 Oct 2016 11:48:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BEF5E160AED for ; Thu, 6 Oct 2016 13:48:24 +0200 (CEST) Received: (qmail 92559 invoked by uid 500); 6 Oct 2016 11:48:23 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 92002 invoked by uid 99); 6 Oct 2016 11:48:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2016 11:48:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B5F42E08B5; Thu, 6 Oct 2016 11:48:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: trohrmann@apache.org To: commits@flink.apache.org Date: Thu, 06 Oct 2016 11:48:52 -0000 Message-Id: <0dccfaf468f247429277671abac84bdb@git.apache.org> In-Reply-To: <7e0fffbe2a644670983dae3a42039097@git.apache.org> References: <7e0fffbe2a644670983dae3a42039097@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] flink git commit: [hotfix] fix ResourceManagerGateway archived-at: Thu, 06 Oct 2016 11:48:26 -0000 [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 Authored: Thu Sep 22 13:56:00 2016 +0200 Committer: Till Rohrmann 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 registerJobMaster( UUID resourceManagerLeaderId, + UUID jobMasterLeaderId, String jobMasterAddress, JobID jobID, @RpcTimeout Time timeout);