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 2019/02/07 13:19:42 UTC
[flink] 03/04: [hotfix] Correct logging statement in ResourceManager
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 3ccb63e240a200cc10180a510efb8c75f33ecc6a
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Tue Feb 5 17:12:18 2019 +0100
[hotfix] Correct logging statement in ResourceManager
---
.../flink/runtime/resourcemanager/ResourceManager.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
index f90f63a..8632afe 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
@@ -314,17 +314,21 @@ public abstract class ResourceManager<WorkerType extends ResourceIDRetrievable>
CompletableFuture<RegistrationResponse> registrationResponseFuture = jobMasterGatewayFuture.thenCombineAsync(
jobMasterIdFuture,
- (JobMasterGateway jobMasterGateway, JobMasterId currentJobMasterId) -> {
- if (Objects.equals(currentJobMasterId, jobMasterId)) {
+ (JobMasterGateway jobMasterGateway, JobMasterId leadingJobMasterId) -> {
+ if (Objects.equals(leadingJobMasterId, jobMasterId)) {
return registerJobMasterInternal(
jobMasterGateway,
jobId,
jobManagerAddress,
jobManagerResourceId);
} else {
- log.debug("The current JobMaster leader id {} did not match the received " +
- "JobMaster id {}.", jobMasterId, currentJobMasterId);
- return new RegistrationResponse.Decline("Job manager leader id did not match.");
+ final String declineMessage = String.format(
+ "The leading JobMaster id %s did not match the received JobMaster id %s. " +
+ "This indicates that a JobMaster leader change has happened.",
+ leadingJobMasterId,
+ jobMasterId);
+ log.debug(declineMessage);
+ return new RegistrationResponse.Decline(declineMessage);
}
},
getMainThreadExecutor());