From 66ce52578ad057e6de9d1e3fc047e482b44f44ef Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Tue, 30 Apr 2019 19:35:31 -0700 Subject: [PATCH 1/2] Query pod status outside loop over containers --- pkg/kubelet/cm/cpumanager/cpu_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager.go b/pkg/kubelet/cm/cpumanager/cpu_manager.go index dd3d297c461..a249effe197 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager.go @@ -225,8 +225,8 @@ func (m *manager) reconcileState() (success []reconciledContainer, failure []rec for _, pod := range m.activePods() { allContainers := pod.Spec.InitContainers allContainers = append(allContainers, pod.Spec.Containers...) + status, ok := m.podStatusProvider.GetPodStatus(pod.UID) for _, container := range allContainers { - status, ok := m.podStatusProvider.GetPodStatus(pod.UID) if !ok { klog.Warningf("[cpumanager] reconcileState: skipping pod; status not found (pod: %s, container: %s)", pod.Name, container.Name) failure = append(failure, reconciledContainer{pod.Name, container.Name, ""}) From 3fc16a7e8289b0ec09c234110df4d7596b4bf565 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Wed, 1 May 2019 15:01:54 -0700 Subject: [PATCH 2/2] Log pod name when pod status cannot be queried --- pkg/kubelet/cm/cpumanager/cpu_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager.go b/pkg/kubelet/cm/cpumanager/cpu_manager.go index a249effe197..3ec708f5d5a 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager.go @@ -228,7 +228,7 @@ func (m *manager) reconcileState() (success []reconciledContainer, failure []rec status, ok := m.podStatusProvider.GetPodStatus(pod.UID) for _, container := range allContainers { if !ok { - klog.Warningf("[cpumanager] reconcileState: skipping pod; status not found (pod: %s, container: %s)", pod.Name, container.Name) + klog.Warningf("[cpumanager] reconcileState: skipping pod; status not found (pod: %s)", pod.Name) failure = append(failure, reconciledContainer{pod.Name, container.Name, ""}) break }