mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 09:22:44 +00:00
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
This commit is contained in:
commit
13a0ce6822
@ -1114,15 +1114,35 @@ func (kl *Kubelet) listPodsFromDisk() ([]types.UID, error) {
|
|||||||
|
|
||||||
// Starts garbage collection threads.
|
// Starts garbage collection threads.
|
||||||
func (kl *Kubelet) StartGarbageCollection() {
|
func (kl *Kubelet) StartGarbageCollection() {
|
||||||
|
loggedContainerGCFailure := false
|
||||||
go wait.Until(func() {
|
go wait.Until(func() {
|
||||||
if err := kl.containerGC.GarbageCollect(kl.sourcesReady.AllReady()); err != nil {
|
if err := kl.containerGC.GarbageCollect(kl.sourcesReady.AllReady()); err != nil {
|
||||||
glog.Errorf("Container garbage collection failed: %v", err)
|
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)
|
}, ContainerGCPeriod, wait.NeverStop)
|
||||||
|
|
||||||
|
loggedImageGCFailure := false
|
||||||
go wait.Until(func() {
|
go wait.Until(func() {
|
||||||
if err := kl.imageManager.GarbageCollect(); err != nil {
|
if err := kl.imageManager.GarbageCollect(); err != nil {
|
||||||
glog.Errorf("Image garbage collection failed: %v", err)
|
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)
|
}, ImageGCPeriod, wait.NeverStop)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user