Repository: flink Updated Branches: refs/heads/master 57b3cde86 -> f1c83a158
[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/f1c83a15 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f1c83a15 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f1c83a15 Branch: refs/heads/master Commit: f1c83a15852b50b004b5916d7da3212b68a89594 Parents: 0180d06 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:05:39 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/f1c83a15/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); } //----------------------------------------------------------------------------------------------
