From c24ef49c90cf01809e5eaea4fde650f9054efead Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Tue, 15 Sep 2015 14:45:56 -0700 Subject: [PATCH] only log when we are actually cancelling an eviction in the node controller --- pkg/controller/node/nodecontroller.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 210e01d2e0a..912988165d0 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -571,12 +571,15 @@ func (nc *NodeController) evictPods(nodeName string) bool { // cancelPodEviction removes any queued evictions, typically because the node is available again. It // returns true if an eviction was queued. func (nc *NodeController) cancelPodEviction(nodeName string) bool { - glog.V(2).Infof("Cancelling pod Eviction on Node: %v", nodeName) nc.evictorLock.Lock() defer nc.evictorLock.Unlock() wasDeleting := nc.podEvictor.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