Skip to content

Commit 8980420

Browse files
authored
Merge pull request kubernetes#83231 from SataQiu/scheduler-err-handle
scheduler: add error handling for *podSpreadCache.removePod
2 parents dd5efc4 + 20e3580 commit 8980420

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

pkg/scheduler/algorithm/predicates/metadata.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ func (c *podSpreadCache) addPod(addedPod, preemptorPod *v1.Pod, node *v1.Node) e
398398
return c.updatePod(addedPod, preemptorPod, node, 1)
399399
}
400400

401-
func (c *podSpreadCache) removePod(deletedPod, preemptorPod *v1.Pod, node *v1.Node) {
402-
c.updatePod(deletedPod, preemptorPod, node, -1)
401+
func (c *podSpreadCache) removePod(deletedPod, preemptorPod *v1.Pod, node *v1.Node) error {
402+
return c.updatePod(deletedPod, preemptorPod, node, -1)
403403
}
404404

405405
func (c *podSpreadCache) updatePod(updatedPod, preemptorPod *v1.Pod, node *v1.Node, delta int32) error {
@@ -459,7 +459,9 @@ func (meta *predicateMetadata) RemovePod(deletedPod *v1.Pod, node *v1.Node) erro
459459
meta.topologyPairsPotentialAffinityPods.removePod(deletedPod)
460460
meta.topologyPairsPotentialAntiAffinityPods.removePod(deletedPod)
461461
// Delete pod from the pod spread topology maps.
462-
meta.podSpreadCache.removePod(deletedPod, meta.pod, node)
462+
if err := meta.podSpreadCache.removePod(deletedPod, meta.pod, node); err != nil {
463+
return err
464+
}
463465
// All pods in the serviceAffinityMatchingPodList are in the same namespace.
464466
// So, if the namespace of the first one is not the same as the namespace of the
465467
// deletedPod, we don't need to check the list, as deletedPod isn't in the list.

0 commit comments

Comments
 (0)