github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33967 from xiang90/fix_33772

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue
2016-10-05 05:17:51 -07:00
committed by GitHub
parent 0ad50d2033 dc62007478
commit 7856e46f1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/scheduler/schedulercache/cache.go
View File

@@ -244,12 +244,12 @@ func (cache *schedulerCache) RemovePod(pod *api.Pod) error {
cache.mu.Lock() cache.mu.Lock()
defer cache.mu.Unlock() defer cache.mu.Unlock()
_, ok := cache.podStates[key] cachedstate, ok := cache.podStates[key]
switch { switch {
// An assumed pod won't have Delete/Remove event. It needs to have Add event // 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. // before Remove event, in which case the state would change from Assumed to Added.
case ok && !cache.assumedPods[key]: case ok && !cache.assumedPods[key]:
err := cache.removePod(pod) err := cache.removePod(cachedstate.pod)
if err != nil { if err != nil {
return err return err
} }