Merge pull request #85561 from cwdsuzhou/Nov/return_when_failed

Return when removePod failed
This commit is contained in:
Kubernetes Prow Robot 2020-01-05 06:23:40 -08:00 committed by GitHub
commit 862c8bf818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -469,7 +469,9 @@ func (cache *schedulerCache) AddPod(pod *v1.Pod) error {
// The pod was added to a different node than it was assumed to.
klog.Warningf("Pod %v was assumed to be on %v but got added to %v", key, pod.Spec.NodeName, currState.pod.Spec.NodeName)
// Clean this up.
cache.removePod(currState.pod)
if err = cache.removePod(currState.pod); err != nil {
klog.Errorf("removing pod error: %v", err)
}
cache.addPod(pod)
}
delete(cache.assumedPods, key)