Merge pull request #44152 from NickrenREN/scheduler-bind

Automatic merge from submit-queue (batch tested with PRs 43900, 44152, 44324) Fix: check "ok" first to avoid panic Check "ok" and then check if "currState.pod.Spec.NodeName != pod.Spec.NodeName", here if currState is nil, it will panic. **Release note**: ```release-note NONE ```

Merge pull request #44152 from NickrenREN/scheduler-bind
3c461095 · Kubernetes Submit Queue · GitHub · da1fe121 · 26482e3c · 3c461095
Commit 3c461095 authored Apr 11, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cache.go plugin/pkg/scheduler/schedulercache/cache.go +1 -1

No files found.
--- a/plugin/pkg/scheduler/schedulercache/cache.go
+++ b/plugin/pkg/scheduler/schedulercache/cache.go
@@ -161,7 +161,7 @@ func (cache *schedulerCache) ForgetPod(pod *v1.Pod) error {
 	defer cache.mu.Unlock()
 	currState, ok := cache.podStates[key]
-	if currState.pod.Spec.NodeName != pod.Spec.NodeName {
+	if ok && currState.pod.Spec.NodeName != pod.Spec.NodeName {
 		return fmt.Errorf("pod %v state was assumed on a different node", key)
 	}