Merge pull request #33967 from xiang90/fix_33772

Automatic merge from submit-queue scheduler: initialize podsWithAffinity Without initializing podsWithAffinity, scheduler panics when deleting a pod from a node that has no pods with affinity ever scheduled to. Fix #33772

Merge pull request #33967 from xiang90/fix_33772
7856e46f · Kubernetes Submit Queue · GitHub · 0ad50d20 · dc620074 · 7856e46f
Commit 7856e46f authored Oct 05, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/plugin/pkg/scheduler/schedulercache/cache.go
+++ b/plugin/pkg/scheduler/schedulercache/cache.go
@@ -244,12 +244,12 @@ func (cache *schedulerCache) RemovePod(pod *api.Pod) error {
 	cache.mu.Lock()
 	defer cache.mu.Unlock()

-	_, ok := cache.podStates[key]
+	cachedstate, ok := cache.podStates[key]
 	switch {
 	// An assumed pod won't have Delete/Remove event. It needs to have Add event
 	// before Remove event, in which case the state would change from Assumed to Added.
 	case ok && !cache.assumedPods[key]:
-		err := cache.removePod(pod)
+		err := cache.removePod(cachedstate.pod)
 		if err != nil {
 			return err
 		}