Repository: flink Updated Branches: refs/heads/release-1.6 aa25b4b32 -> 5f5b0fb96
[FLINK-9911][JM] Use SlotPoolGateway to call failAllocation Since the SlotPool is an actor, we must use the SlotPoolGateway to interact with the SlotPool. Otherwise, we might risk an inconsistent state since there are multiple threads modifying the component. This closes #6386. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5f5b0fb9 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5f5b0fb9 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5f5b0fb9 Branch: refs/heads/release-1.6 Commit: 5f5b0fb96e6ec6f665701f2894a2704893537594 Parents: 4608f67 Author: Till Rohrmann <trohrm...@apache.org> Authored: Sun Jul 22 21:57:59 2018 +0200 Committer: Till Rohrmann <trohrm...@apache.org> Committed: Tue Jul 24 00:06:31 2018 +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/5f5b0fb9/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 1660f95..c47f4fd 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 @@ -983,7 +983,7 @@ public class JobMaster extends FencedRpcEndpoint<JobMasterId> implements JobMast @Override public void notifyAllocationFailure(AllocationID allocationID, Exception cause) { - slotPool.failAllocation(allocationID, cause); + slotPoolGateway.failAllocation(allocationID, cause); } //----------------------------------------------------------------------------------------------
