Merge pull request #46654 from yujuhong/reduce-log-spam

Automatic merge from submit-queue (batch tested with PRs 46076, 43879, 44897, 46556, 46654) kubelet status manager: short-circut the evaluation if possible This avoids redundant checks in the `PodResourcesAreReclaimed`, which also logs misleading "Pod is terminated" messages on every check /cc @kubernetes/sig-node-pr-reviews

Merge pull request #46654 from yujuhong/reduce-log-spam
154b816a · Kubernetes Submit Queue · GitHub · e97b7229 · ccfecb1e · 154b816a
Commit 154b816a authored May 30, 2017 by Kubernetes Submit Queue Committed by GitHub May 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

status_manager.go pkg/kubelet/status/status_manager.go +4 -1

No files found.
--- a/pkg/kubelet/status/status_manager.go
+++ b/pkg/kubelet/status/status_manager.go
@@ -483,7 +483,10 @@ func (m *manager) needsUpdate(uid types.UID, status versionedPodStatus) bool {
 }
 func (m *manager) canBeDeleted(pod *v1.Pod, status v1.PodStatus) bool {
-	return !kubepod.IsMirrorPod(pod) && m.podDeletionSafety.PodResourcesAreReclaimed(pod, status) && pod.DeletionTimestamp != nil
+	if pod.DeletionTimestamp == nil || kubepod.IsMirrorPod(pod) {
+		return false
+	}
+	return m.podDeletionSafety.PodResourcesAreReclaimed(pod, status)
 }
 // needsReconcile compares the given status with the status in the pod manager (which