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 2018/03/27 09:37:35 UTC
[7/9] flink git commit: [hotfix] Poll invariant variables out of
polling loop in RestClusterClient#rescaleJob
[hotfix] Poll invariant variables out of polling loop in RestClusterClient#rescaleJob
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4c234fe1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4c234fe1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4c234fe1
Branch: refs/heads/master
Commit: 4c234fe107fb285ab4a88279b352dc77662346f8
Parents: d46c182
Author: Till Rohrmann <tr...@apache.org>
Authored: Tue Mar 27 08:31:56 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Tue Mar 27 08:34:56 2018 +0200
----------------------------------------------------------------------
.../client/program/rest/RestClusterClient.java | 25 +++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/4c234fe1/flink-clients/src/main/java/org/apache/flink/client/program/rest/RestClusterClient.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/rest/RestClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/rest/RestClusterClient.java
index 9129714..cf68374 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/rest/RestClusterClient.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/rest/RestClusterClient.java
@@ -507,21 +507,18 @@ public class RestClusterClient<T> extends ClusterClient<T> {
final CompletableFuture<AsynchronousOperationInfo> rescalingOperationFuture = rescalingTriggerResponseFuture.thenCompose(
(TriggerResponse triggerResponse) -> {
final TriggerId triggerId = triggerResponse.getTriggerId();
+ final RescalingStatusHeaders rescalingStatusHeaders = RescalingStatusHeaders.getInstance();
+ final RescalingStatusMessageParameters rescalingStatusMessageParameters = rescalingStatusHeaders.getUnresolvedMessageParameters();
+
+ rescalingStatusMessageParameters.jobPathParameter.resolve(jobId);
+ rescalingStatusMessageParameters.triggerIdPathParameter.resolve(triggerId);
return pollResourceAsync(
- () -> {
- final RescalingStatusHeaders rescalingStatusHeaders = RescalingStatusHeaders.getInstance();
- final RescalingStatusMessageParameters rescalingStatusMessageParameters = rescalingStatusHeaders.getUnresolvedMessageParameters();
-
- rescalingStatusMessageParameters.jobPathParameter.resolve(jobId);
- rescalingStatusMessageParameters.triggerIdPathParameter.resolve(triggerId);
- return sendRetryableRequest(
- rescalingStatusHeaders,
- rescalingStatusMessageParameters,
- EmptyRequestBody.getInstance(),
- isConnectionProblemException());
- }
- );
+ () -> sendRetryableRequest(
+ rescalingStatusHeaders,
+ rescalingStatusMessageParameters,
+ EmptyRequestBody.getInstance(),
+ isConnectionProblemException()));
});
return rescalingOperationFuture.thenApply(
@@ -535,7 +532,7 @@ public class RestClusterClient<T> extends ClusterClient<T> {
}
@Override
- public CompletableFuture<Acknowledge> disposeSavepoint(String savepointPath, Time timeout) {
+ public CompletableFuture<Acknowledge> disposeSavepoint(String savepointPath) {
final SavepointDisposalRequest savepointDisposalRequest = new SavepointDisposalRequest(savepointPath);
final CompletableFuture<TriggerResponse> savepointDisposalTriggerFuture = sendRequest(