github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 22:05:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33567 from pmorie/gc-event

Browse Source 
Automatic merge from submit-queue

Add node event for container/image GC failure

Follow up to #31988.  Add an event for a node when container/image GC fails.
This commit is contained in:
Kubernetes Submit Queue 2016-10-07 00:45:24 -07:00 committed by GitHub
commit 144d88b0a1
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/events/event.go
View File

@ -55,6 +55,8 @@ const (
HostNetworkNotSupported = "HostNetworkNotSupported" HostNetworkNotSupported = "HostNetworkNotSupported"
UndefinedShaper = "NilShaper" UndefinedShaper = "NilShaper"
NodeRebooted = "Rebooted" NodeRebooted = "Rebooted"
ContainerGCFailed = "ContainerGCFailed"
ImageGCFailed = "ImageGCFailed"
// Image manager event reason list // Image manager event reason list
InvalidDiskCapacity = "InvalidDiskCapacity" InvalidDiskCapacity = "InvalidDiskCapacity"

2
pkg/kubelet/kubelet.go
View File

@ -1045,6 +1045,7 @@ func (kl *Kubelet) StartGarbageCollection() {
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)
kl.recorder.Eventf(kl.nodeRef, api.EventTypeWarning, events.ContainerGCFailed, err.Error())
loggedContainerGCFailure = true loggedContainerGCFailure = true
} else { } else {
var vLevel glog.Level = 4 var vLevel glog.Level = 4
@ -1061,6 +1062,7 @@ func (kl *Kubelet) StartGarbageCollection() {
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)
kl.recorder.Eventf(kl.nodeRef, api.EventTypeWarning, events.ImageGCFailed, err.Error())
loggedImageGCFailure = true loggedImageGCFailure = true
} else { } else {
var vLevel glog.Level = 4 var vLevel glog.Level = 4