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

Exit scheduler retry loop correctly

Browse Source 
The error was being eaten and shadowed, which means we would never exit
this loop. This might lead to a goroutine in the scheduler being used
forever without exiting at maximum backoff.

Switched to use the real client to make later refactors easier.
This commit is contained in:
Clayton Coleman 2016-09-14 00:33:28 -04:00
parent e357b9a6f4
commit 4d79030b8d
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/pkg/scheduler/factory/factory.go
View File

@ -532,10 +532,13 @@ func (factory *ConfigFactory) makeDefaultErrorFunc(backoff *podBackoff, podQueue
return return
} }
// Get the pod again; it may have changed/been scheduled already. // Get the pod again; it may have changed/been scheduled already.
pod = &api.Pod{}
getBackoff := initialGetBackoff getBackoff := initialGetBackoff
for { for {
if err := factory.Client.Get().Namespace(podID.Namespace).Resource("pods").Name(podID.Name).Do().Into(pod); err == nil { pod, err := factory.Client.Pods(podID.Namespace).Get(podID.Name)
if err == nil {
if len(pod.Spec.NodeName) == 0 {
podQueue.AddIfNotPresent(pod)
}
break break
} }
if errors.IsNotFound(err) { if errors.IsNotFound(err) {
@ -548,9 +551,6 @@ func (factory *ConfigFactory) makeDefaultErrorFunc(backoff *podBackoff, podQueue
} }
time.Sleep(getBackoff) time.Sleep(getBackoff)
} }
if pod.Spec.NodeName == "" {
podQueue.AddIfNotPresent(pod)
}
}() }()
} }
} }