Skip to content

Commit

Permalink
Merge pull request #49444 from eparis/drain-livelock
Browse files Browse the repository at this point in the history
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 #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
```
  • Loading branch information
Kubernetes Submit Queue committed Jul 24, 2017
2 parents 84db0a9 + 7c531ec commit 9891f66
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkg/kubectl/cmd/drain.go
Expand Up @@ -495,9 +495,12 @@ func (o *DrainOptions) evictPods(pods []api.Pod, policyGroupVersion string, getP
err = o.evictPod(pod, policyGroupVersion)
if err == nil {
break
} else if apierrors.IsNotFound(err) {
doneCh <- true
return
} else if apierrors.IsTooManyRequests(err) {
time.Sleep(5 * time.Second)
} else if !apierrors.IsNotFound(err) {
} else {
errCh <- fmt.Errorf("error when evicting pod %q: %v", pod.Name, err)
return
}
Expand Down

0 comments on commit 9891f66

Please sign in to comment.