github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14000 from mikedanese/nc_spam

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-16 04:45:40 -07:00
commit 75bce0ed8d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/node/nodecontroller.go
View File

@ -571,12 +571,15 @@ func (nc *NodeController) evictPods(nodeName string) bool {
// cancelPodEviction removes any queued evictions, typically because the node is available again. It // cancelPodEviction removes any queued evictions, typically because the node is available again. It
// returns true if an eviction was queued. // returns true if an eviction was queued.
func (nc *NodeController) cancelPodEviction(nodeName string) bool { func (nc *NodeController) cancelPodEviction(nodeName string) bool {
glog.V(2).Infof("Cancelling pod Eviction on Node: %v", nodeName)
nc.evictorLock.Lock() nc.evictorLock.Lock()
defer nc.evictorLock.Unlock() defer nc.evictorLock.Unlock()
wasDeleting := nc.podEvictor.Remove(nodeName) wasDeleting := nc.podEvictor.Remove(nodeName)
wasTerminating := nc.terminationEvictor.Remove(nodeName) wasTerminating := nc.terminationEvictor.Remove(nodeName)
return wasDeleting || wasTerminating if wasDeleting || wasTerminating {
glog.V(2).Infof("Cancelling pod Eviction on Node: %v", nodeName)
return true
}
return false
} }
// deletePods will delete all pods from master running on given node, and return true // deletePods will delete all pods from master running on given node, and return true