github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83625 from mrobson/log-cgroups

Browse Source 
Add podCgroup to process kill events to allow for correlation
This commit is contained in:
Kubernetes Prow Robot 2019-10-09 00:56:01 -07:00 committed by GitHub
commit 5ce75a8734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/cm/pod_container_manager_linux.go
View File

@ -23,7 +23,7 @@ import (
"path" "path"
"strings" "strings"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilerrors "k8s.io/apimachinery/pkg/util/errors" utilerrors "k8s.io/apimachinery/pkg/util/errors"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
@ -160,23 +160,23 @@ func (m *podContainerManagerImpl) tryKillingCgroupProcesses(podCgroup CgroupName
removed := map[int]bool{} removed := map[int]bool{}
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {
if i != 0 { 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{} errlist = []error{}
for _, pid := range pidsToKill { for _, pid := range pidsToKill {
if _, ok := removed[pid]; ok { if _, ok := removed[pid]; ok {
continue 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 { 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) errlist = append(errlist, err)
} else { } else {
removed[pid] = true removed[pid] = true
} }
} }
if len(errlist) == 0 { 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 return nil
} }
} }