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/09/28 08:20:58 UTC
[15/50] [abbrv] flink git commit: [hotfix] [clustermgnt] Set pending
registration properly in TaskExecutorToResourceManagerConnection
[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/86f2fa31
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/86f2fa31
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/86f2fa31
Branch: refs/heads/flip-6
Commit: 86f2fa31f1334a18633eec531303e652bfc4b54b
Parents: 2f7a673
Author: Till Rohrmann <tr...@apache.org>
Authored: Mon Aug 29 17:40:57 2016 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Tue Sep 27 19:24:57 2016 +0200
----------------------------------------------------------------------
.../TaskExecutorToResourceManagerConnection.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/86f2fa31/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<Tuple2<ResourceManagerGateway, TaskExecutorRegistrationSuccess>> future = registration.getFuture();
+ Future<Tuple2<ResourceManagerGateway, TaskExecutorRegistrationSuccess>> future = pendingRegistration.getFuture();
future.onSuccess(new OnSuccess<Tuple2<ResourceManagerGateway, TaskExecutorRegistrationSuccess>>() {
@Override
@@ -167,14 +167,14 @@ public class TaskExecutorToResourceManagerConnection {
// Utilities
// ------------------------------------------------------------------------
- static class ResourceManagerRegistration
+ private static class ResourceManagerRegistration
extends RetryingRegistration<ResourceManagerGateway, TaskExecutorRegistrationSuccess> {
private final String taskExecutorAddress;
private final ResourceID resourceID;
- public ResourceManagerRegistration(
+ ResourceManagerRegistration(
Logger log,
RpcService rpcService,
String targetAddress,