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 fb50658c27ebbd14f9d240165e6b47f5229dddd4 Author: Till Rohrmann <[email protected]> AuthorDate: Fri Sep 21 15:53:52 2018 +0200 [hotfix] Cancel actual pending slot request in SlotManager#updateSlotState --- .../flink/runtime/resourcemanager/slotmanager/SlotManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManager.java index 2fa1844..2ef2b2f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/SlotManager.java @@ -642,7 +642,11 @@ public class SlotManager implements AutoCloseable { slot.updateAllocation(allocationId, jobId); // remove the pending request if any as it has been assigned - pendingSlotRequests.remove(allocationId); + final PendingSlotRequest actualPendingSlotRequest = pendingSlotRequests.remove(allocationId); + + if (actualPendingSlotRequest != null) { + cancelPendingSlotRequest(actualPendingSlotRequest); + } // this will try to find a new slot for the request rejectPendingSlotRequest(
