From 506df24c1ff2c203c04a38b8f45a5c465ac53f15 Mon Sep 17 00:00:00 2001
From: CJ Cullen <cjcullen@google.com>
Date: Tue, 1 Mar 2016 11:04:18 -0800
Subject: [PATCH] Revert "Evict pods w/o rate-limit when cloud says node is
 gone."

---
 pkg/controller/node/nodecontroller.go | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go
index df3a41d3f40..e9099766e4b 100644
--- a/pkg/controller/node/nodecontroller.go
+++ b/pkg/controller/node/nodecontroller.go
@@ -479,26 +479,9 @@ func (nc *NodeController) monitorNodeStatus() error {
 						continue
 					}
 					if remaining {
-						// Immediately evict pods (skip rate-limited evictor)
+						// queue eviction of the pods on the node
 						glog.V(2).Infof("Deleting node %s is delayed while pods are evicted", node.Name)
-						go func(nodeName string) {
-							nc.evictorLock.Lock()
-							defer nc.evictorLock.Unlock()
-							remaining, err := nc.deletePods(nodeName)
-							if err != nil {
-								glog.Errorf("Unable to evict pods from node %s: %v", nodeName, err)
-								nc.podEvictor.Add(nodeName)
-								return
-							}
-							if !remaining {
-								return
-							}
-							// Immediately terminate pods.
-							if _, _, err := nc.terminatePods(nodeName, time.Now()); err != nil {
-								glog.Errorf("Unable to terminate pods on node %s: %v", nodeName, err)
-								nc.terminationEvictor.Add(nodeName)
-							}
-						}(node.Name)
+						nc.evictPods(node.Name)
 						continue
 					}