Merge pull request #31988 from pmorie/gc-log

Automatic merge from submit-queue Add positive logging for GC events We have no positive logging for GC events. This PR: 1. Adds positive logging at V(4) for success cases 2. Adds positive logging at V(1) for the first successful GC after a failure

Merge pull request #31988 from pmorie/gc-log
13a0ce68 · Kubernetes Submit Queue · GitHub · cba0c6fb · bd83f8b2 · 13a0ce68
Commit 13a0ce68 authored Sep 23, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 0 deletions

kubelet.go pkg/kubelet/kubelet.go +20 -0

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1114,15 +1114,35 @@ func (kl *Kubelet) listPodsFromDisk() ([]types.UID, error) {

 // Starts garbage collection threads.
 func (kl *Kubelet) StartGarbageCollection() {
+	loggedContainerGCFailure := false
 	go wait.Until(func() {
 		if err := kl.containerGC.GarbageCollect(kl.sourcesReady.AllReady()); err != nil {
 			glog.Errorf("Container garbage collection failed: %v", err)
+			loggedContainerGCFailure = true
+		} else {
+			var vLevel glog.Level = 4
+			if loggedContainerGCFailure {
+				vLevel = 1
+				loggedContainerGCFailure = false
+			}
+
+			glog.V(vLevel).Infof("Container garbage collection succeeded")
 		}
 	}, ContainerGCPeriod, wait.NeverStop)

+	loggedImageGCFailure := false
 	go wait.Until(func() {
 		if err := kl.imageManager.GarbageCollect(); err != nil {
 			glog.Errorf("Image garbage collection failed: %v", err)
+			loggedImageGCFailure = true
+		} else {
+			var vLevel glog.Level = 4
+			if loggedImageGCFailure {
+				vLevel = 1
+				loggedImageGCFailure = false
+			}
+
+			glog.V(vLevel).Infof("Image garbage collection succeeded")
 		}
 	}, ImageGCPeriod, wait.NeverStop)
 }