[FLINK-14701][runtime] Fix MultiTaskSlot to not remove slots which ar…

…e not its children
apache · Jan 23, 2020 · 0bdd21a · 0bdd21a
1 parent 772d83e
commit 0bdd21a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManager.java b/...runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManager.java
@@ -612,7 +612,9 @@ private void releaseChild(AbstractID childGroupId) {
 				TaskSlot child = children.remove(childGroupId);
 
 				if (child != null) {
-					allTaskSlots.remove(child.getSlotRequestId());
+					if (child == allTaskSlots.get(child.getSlotRequestId())) {
+						allTaskSlots.remove(child.getSlotRequestId());
+					}
 
 					// Update the resources of this slot and the parents
 					releaseResource(child.getReservedResources());