From fc6b4719fdd7b1af5f7036a67e0bb3db28918925 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Thu, 5 Mar 2020 11:04:02 -0800 Subject: [PATCH] Use the container whose limit is hit for system OOMs --- pkg/kubelet/oom/oom_watcher_linux.go | 2 +- pkg/kubelet/oom/oom_watcher_linux_test.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/kubelet/oom/oom_watcher_linux.go b/pkg/kubelet/oom/oom_watcher_linux.go index 698da28e5db..ee5d5849e90 100644 --- a/pkg/kubelet/oom/oom_watcher_linux.go +++ b/pkg/kubelet/oom/oom_watcher_linux.go @@ -72,7 +72,7 @@ func (ow *realWatcher) Start(ref *v1.ObjectReference) error { defer runtime.HandleCrash() for event := range outStream { - if event.ContainerName == recordEventContainerName { + if event.VictimContainerName == recordEventContainerName { klog.V(1).Infof("Got sys oom event: %v", event) eventMsg := "System OOM encountered" if event.ProcessName != "" && event.Pid != 0 { diff --git a/pkg/kubelet/oom/oom_watcher_linux_test.go b/pkg/kubelet/oom/oom_watcher_linux_test.go index c91164e75ba..94e9dd6e1f6 100644 --- a/pkg/kubelet/oom/oom_watcher_linux_test.go +++ b/pkg/kubelet/oom/oom_watcher_linux_test.go @@ -57,8 +57,8 @@ func TestWatcherRecordsEventsForOomEvents(t *testing.T) { Pid: 1000, ProcessName: "fakeProcess", TimeOfDeath: time.Now(), - ContainerName: recordEventContainerName, - VictimContainerName: "some-container", + ContainerName: recordEventContainerName + "some-container", + VictimContainerName: recordEventContainerName, }, } numExpectedOomEvents := len(oomInstancesToStream) @@ -109,15 +109,15 @@ func TestWatcherRecordsEventsForOomEventsCorrectContainerName(t *testing.T) { Pid: 1000, ProcessName: "fakeProcess", TimeOfDeath: time.Now(), - ContainerName: recordEventContainerName, - VictimContainerName: "some-container", + ContainerName: recordEventContainerName + "some-container", + VictimContainerName: recordEventContainerName, }, { Pid: 1000, ProcessName: "fakeProcess", TimeOfDeath: time.Now(), - ContainerName: "/dont-record-oom-event", - VictimContainerName: "some-container", + ContainerName: recordEventContainerName + "kubepods/some-container", + VictimContainerName: recordEventContainerName + "kubepods", }, } numExpectedOomEvents := len(oomInstancesToStream) - numOomEventsWithIncorrectContainerName @@ -151,8 +151,8 @@ func TestWatcherRecordsEventsForOomEventsWithAdditionalInfo(t *testing.T) { Pid: eventPid, ProcessName: processName, TimeOfDeath: time.Now(), - ContainerName: recordEventContainerName, - VictimContainerName: "some-container", + ContainerName: recordEventContainerName + "some-container", + VictimContainerName: recordEventContainerName, }, } numExpectedOomEvents := len(oomInstancesToStream)