Merge pull request #49444 from eparis/drain-livelock

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 ```

Merge pull request #49444 from eparis/drain-livelock
9891f666 · Kubernetes Submit Queue · GitHub · 84db0a94 · 7c531ecc · 9891f666
Commit 9891f666 authored Jul 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

drain.go pkg/kubectl/cmd/drain.go +4 -1

No files found.
--- a/pkg/kubectl/cmd/drain.go
+++ b/pkg/kubectl/cmd/drain.go
@@ -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
 				}