github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44152 from NickrenREN/scheduler-bind

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-11 07:57:16 -07:00 committed by GitHub
commit 3c461095cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ func (cache *schedulerCache) ForgetPod(pod *v1.Pod) error {
defer cache.mu.Unlock() defer cache.mu.Unlock()
currState, ok := cache.podStates[key] 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) return fmt.Errorf("pod %v state was assumed on a different node", key)
} }