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
pull/6/head
Kubernetes Submit Queue 2016-10-05 05:17:51 -07:00 committed by GitHub
commit 7856e46f1b
1 changed files with 2 additions and 2 deletions

View File

@ -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
}