Repository: flink Updated Branches: refs/heads/master 4fc019a96 -> 25e9f83c4
[hotfix] Test properly default JobMasterId in JobMaster#suspendExecution Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/25e9f83c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/25e9f83c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/25e9f83c Branch: refs/heads/master Commit: 25e9f83c4ba522b111e2d661ae7715ad9a46f38b Parents: 4fc019a Author: Till Rohrmann <[email protected]> Authored: Wed Sep 20 00:46:25 2017 +0200 Committer: Till Rohrmann <[email protected]> Committed: Wed Sep 20 00:48:35 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/flink/runtime/jobmaster/JobMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/25e9f83c/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java index 80d6e4f..2bfe277 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java @@ -791,7 +791,7 @@ public class JobMaster extends FencedRpcEndpoint<JobMasterId> implements JobMast private Acknowledge suspendExecution(final Throwable cause) { validateRunsInMainThread(); - if (getFencingToken() == null) { + if (Objects.equals(JobMasterId.INITIAL_JOB_MASTER_ID, getFencingToken())) { log.debug("Job has already been suspended or shutdown."); return Acknowledge.get(); }
