[08/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/d975717c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d975717c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d975717c Branch: refs/heads/flip-6 Commit: d975717cf7afa8f99ff29e282ada1d819c6f8988 Parents: f56a822 Author: Till RohrmannAuthored: Mon Aug 29 17:40:57 2016 +0200 Committer: Till Rohrmann Committed: Thu Oct 6 13:38:39 2016 +0200 -- .../TaskExecutorToResourceManagerConnection.java| 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flink/blob/d975717c/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,
[09/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/39a36994 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/39a36994 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/39a36994 Branch: refs/heads/flip-6 Commit: 39a36994df5f0f57ea1f9258eaaa1d42487b4b10 Parents: 1a8a993 Author: Till RohrmannAuthored: Mon Aug 29 17:40:57 2016 +0200 Committer: Till Rohrmann Committed: Sun Oct 2 23:44:42 2016 +0200 -- .../TaskExecutorToResourceManagerConnection.java| 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flink/blob/39a36994/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,
[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 RohrmannAuthored: Mon Aug 29 17:40:57 2016 +0200 Committer: Till Rohrmann 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 > 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,
[39/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/ffd20e98 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ffd20e98 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ffd20e98 Branch: refs/heads/flip-6 Commit: ffd20e981a4c534d9110cc0227ae44fa03e33db0 Parents: 9e90412 Author: Till RohrmannAuthored: Mon Aug 29 17:40:57 2016 +0200 Committer: Till Rohrmann Committed: Wed Sep 21 11:39:16 2016 +0200 -- .../TaskExecutorToResourceManagerConnection.java| 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flink/blob/ffd20e98/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,
[41/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/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 RohrmannAuthored: 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,
flink git commit: [hotfix] [clustermgnt] Set pending registration properly in TaskExecutorToResourceManagerConnection
Repository: flink Updated Branches: refs/heads/flip-6 734297615 -> 5d71a552a [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/5d71a552 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5d71a552 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5d71a552 Branch: refs/heads/flip-6 Commit: 5d71a552a4ef76809400eb7af2ee920da27ed193 Parents: 7342976 Author: Till RohrmannAuthored: Mon Aug 29 17:40:57 2016 +0200 Committer: Till Rohrmann Committed: Mon Aug 29 17:40:57 2016 +0200 -- .../TaskExecutorToResourceManagerConnection.java| 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flink/blob/5d71a552/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,