flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [41/50] [abbrv] flink git commit: [hotfix] [clustermgnt] Set pending registration properly in TaskExecutorToResourceManagerConnection
Date Thu, 08 Sep 2016 15:29:03 GMT
[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 <trohrmann@apache.org>
Authored: Mon Aug 29 17:40:57 2016 +0200
Committer: Till Rohrmann <trohrmann@apache.org>
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<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,


Mime
View raw message