github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49444 from eparis/drain-livelock

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 49444, 47864, 48584, 49395, 49118)

Do not spin forever if kubectl drain races with other removal

In https://github.com/kubernetes/kubernetes/pull/47450 we stopped
returning an error if a pod disappeared before we could remove it.
Instead we just continue to spin forever. Return "success" if a pod
disappeared before we actually removed it.

https://bugzilla.redhat.com/1473777
bug 1473777

```release-note
`kubectl drain` no longer spins trying to delete pods that do not exist
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-24 13:52:31 -07:00 committed by GitHub
commit 9891f66672
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/cmd/drain.go
View File

@ -495,9 +495,12 @@ func (o *DrainOptions) evictPods(pods []api.Pod, policyGroupVersion string, getP
err = o.evictPod(pod, policyGroupVersion) err = o.evictPod(pod, policyGroupVersion)
if err == nil { if err == nil {
break break
} else if apierrors.IsNotFound(err) {
doneCh <- true
return
} else if apierrors.IsTooManyRequests(err) { } else if apierrors.IsTooManyRequests(err) {
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
} else if !apierrors.IsNotFound(err) { } else {
errCh <- fmt.Errorf("error when evicting pod %q: %v", pod.Name, err) errCh <- fmt.Errorf("error when evicting pod %q: %v", pod.Name, err)
return return
} }