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 09756200B8D for ; Thu, 8 Sep 2016 17:28:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 082AE160AD1; Thu, 8 Sep 2016 15:28:28 +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 31CCE160AE0 for ; Thu, 8 Sep 2016 17:28:27 +0200 (CEST) Received: (qmail 33778 invoked by uid 500); 8 Sep 2016 15:28:26 -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 32799 invoked by uid 99); 8 Sep 2016 15:28:24 -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, 08 Sep 2016 15:28:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AD89DE0230; Thu, 8 Sep 2016 15:28:24 +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, 08 Sep 2016 15:29:03 -0000 Message-Id: <36fe6d7b5ea64caf95d7adda5369b33b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [41/50] [abbrv] flink git commit: [hotfix] [clustermgnt] Set pending registration properly in TaskExecutorToResourceManagerConnection archived-at: Thu, 08 Sep 2016 15:28:28 -0000 [hotfix] [clustermgnt] Set pending registration properly in TaskExecutorToResourceManagerConnection Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/20fefaae Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/20fefaae Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/20fefaae Branch: refs/heads/flip-6 Commit: 20fefaae286ca3bd61b6d6bde91ca3f5b715c99b Parents: 282566d Author: Till Rohrmann Authored: Mon Aug 29 17:40:57 2016 +0200 Committer: Till Rohrmann Committed: Thu Sep 8 17:27:00 2016 +0200 ---------------------------------------------------------------------- .../TaskExecutorToResourceManagerConnection.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/20fefaae/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java index f398b7d..7ccc879 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java @@ -55,7 +55,7 @@ public class TaskExecutorToResourceManagerConnection { private final String resourceManagerAddress; - private ResourceManagerRegistration pendingRegistration; + private TaskExecutorToResourceManagerConnection.ResourceManagerRegistration pendingRegistration; private ResourceManagerGateway registeredResourceManager; @@ -86,13 +86,13 @@ public class TaskExecutorToResourceManagerConnection { checkState(!closed, "The connection is already closed"); checkState(!isRegistered() && pendingRegistration == null, "The connection is already started"); - ResourceManagerRegistration registration = new ResourceManagerRegistration( + pendingRegistration = new TaskExecutorToResourceManagerConnection.ResourceManagerRegistration( log, taskExecutor.getRpcService(), resourceManagerAddress, resourceManagerLeaderId, taskExecutor.getAddress(), taskExecutor.getResourceID()); - registration.startRegistration(); + pendingRegistration.startRegistration(); - Future> future = registration.getFuture(); + Future> future = pendingRegistration.getFuture(); future.onSuccess(new OnSuccess>() { @Override @@ -167,14 +167,14 @@ public class TaskExecutorToResourceManagerConnection { // Utilities // ------------------------------------------------------------------------ - static class ResourceManagerRegistration + private static class ResourceManagerRegistration extends RetryingRegistration { private final String taskExecutorAddress; private final ResourceID resourceID; - public ResourceManagerRegistration( + ResourceManagerRegistration( Logger log, RpcService rpcService, String targetAddress,