From ad3dcb9fa0305379d44a4b90d86dffce980980c8 Mon Sep 17 00:00:00 2001 From: mrobson Date: Tue, 8 Oct 2019 13:12:48 -0400 Subject: [PATCH] Add podCgroup to process kill events to allow for correlation --- pkg/kubelet/cm/pod_container_manager_linux.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/cm/pod_container_manager_linux.go b/pkg/kubelet/cm/pod_container_manager_linux.go index 1be4f44775e..02059eeed18 100644 --- a/pkg/kubelet/cm/pod_container_manager_linux.go +++ b/pkg/kubelet/cm/pod_container_manager_linux.go @@ -23,7 +23,7 @@ import ( "path" "strings" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -160,23 +160,23 @@ func (m *podContainerManagerImpl) tryKillingCgroupProcesses(podCgroup CgroupName removed := map[int]bool{} for i := 0; i < 5; i++ { if i != 0 { - klog.V(3).Infof("Attempt %v failed to kill all unwanted process. Retyring", i) + klog.V(3).Infof("Attempt %v failed to kill all unwanted process from cgroup: %v. Retyring", i, podCgroup) } errlist = []error{} for _, pid := range pidsToKill { if _, ok := removed[pid]; ok { continue } - klog.V(3).Infof("Attempt to kill process with pid: %v", pid) + klog.V(3).Infof("Attempt to kill process with pid: %v from cgroup: %v", pid, podCgroup) if err := m.killOnePid(pid); err != nil { - klog.V(3).Infof("failed to kill process with pid: %v", pid) + klog.V(3).Infof("failed to kill process with pid: %v from cgroup: %v", pid, podCgroup) errlist = append(errlist, err) } else { removed[pid] = true } } if len(errlist) == 0 { - klog.V(3).Infof("successfully killed all unwanted processes.") + klog.V(3).Infof("successfully killed all unwanted processes from cgroup: %v", podCgroup) return nil } }