From 1714fbfa754d506a97da2d761237252d67a709e6 Mon Sep 17 00:00:00 2001 From: Swati Sehgal Date: Thu, 16 Jan 2025 08:28:48 +0000 Subject: [PATCH 1/7] node: memory-mgr: Change ErrorS(nil, ...) to InfoS Ensure consistency across resource managers and update ErrorS(nil, ...) to InfoS. Signed-off-by: Swati Sehgal --- pkg/kubelet/cm/memorymanager/policy_static.go | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/kubelet/cm/memorymanager/policy_static.go b/pkg/kubelet/cm/memorymanager/policy_static.go index 115e74afa27..9187900dfd5 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static.go +++ b/pkg/kubelet/cm/memorymanager/policy_static.go @@ -304,18 +304,18 @@ func regenerateHints(pod *v1.Pod, ctn *v1.Container, ctnBlocks []state.Block, re } if len(ctnBlocks) != len(reqRsrc) { - klog.ErrorS(nil, "The number of requested resources by the container differs from the number of memory blocks", "containerName", ctn.Name) + klog.InfoS("The number of requested resources by the container differs from the number of memory blocks", "containerName", ctn.Name) return nil } for _, b := range ctnBlocks { if _, ok := reqRsrc[b.Type]; !ok { - klog.ErrorS(nil, "Container requested resources do not have resource of this type", "containerName", ctn.Name, "type", b.Type) + klog.InfoS("Container requested resources do not have resource of this type", "containerName", ctn.Name, "type", b.Type) return nil } if b.Size != reqRsrc[b.Type] { - klog.ErrorS(nil, "Memory already allocated with different numbers than requested", "podUID", pod.UID, "type", b.Type, "containerName", ctn.Name, "requestedResource", reqRsrc[b.Type], "allocatedSize", b.Size) + klog.InfoS("Memory already allocated with different numbers than requested", "podUID", pod.UID, "type", b.Type, "containerName", ctn.Name, "requestedResource", reqRsrc[b.Type], "allocatedSize", b.Size) return nil } @@ -654,36 +654,36 @@ func (p *staticPolicy) validateState(s state.State) error { func areMachineStatesEqual(ms1, ms2 state.NUMANodeMap) bool { if len(ms1) != len(ms2) { - klog.ErrorS(nil, "Node states are different", "lengthNode1", len(ms1), "lengthNode2", len(ms2)) + klog.InfoS("Node states are different", "lengthNode1", len(ms1), "lengthNode2", len(ms2)) return false } for nodeID, nodeState1 := range ms1 { nodeState2, ok := ms2[nodeID] if !ok { - klog.ErrorS(nil, "Node state does not have node ID", "nodeID", nodeID) + klog.InfoS("Node state does not have node ID", "nodeID", nodeID) return false } if nodeState1.NumberOfAssignments != nodeState2.NumberOfAssignments { - klog.ErrorS(nil, "Node states number of assignments are different", "assignment1", nodeState1.NumberOfAssignments, "assignment2", nodeState2.NumberOfAssignments) + klog.InfoS("Node states number of assignments are different", "assignment1", nodeState1.NumberOfAssignments, "assignment2", nodeState2.NumberOfAssignments) return false } if !areGroupsEqual(nodeState1.Cells, nodeState2.Cells) { - klog.ErrorS(nil, "Node states groups are different", "stateNode1", nodeState1.Cells, "stateNode2", nodeState2.Cells) + klog.InfoS("Node states groups are different", "stateNode1", nodeState1.Cells, "stateNode2", nodeState2.Cells) return false } if len(nodeState1.MemoryMap) != len(nodeState2.MemoryMap) { - klog.ErrorS(nil, "Node states memory map have different lengths", "lengthNode1", len(nodeState1.MemoryMap), "lengthNode2", len(nodeState2.MemoryMap)) + klog.InfoS("Node states memory map have different lengths", "lengthNode1", len(nodeState1.MemoryMap), "lengthNode2", len(nodeState2.MemoryMap)) return false } for resourceName, memoryState1 := range nodeState1.MemoryMap { memoryState2, ok := nodeState2.MemoryMap[resourceName] if !ok { - klog.ErrorS(nil, "Memory state does not have resource", "resource", resourceName) + klog.InfoS("Memory state does not have resource", "resource", resourceName) return false } @@ -715,17 +715,17 @@ func areMachineStatesEqual(ms1, ms2 state.NUMANodeMap) bool { func areMemoryStatesEqual(memoryState1, memoryState2 *state.MemoryTable, nodeID int, resourceName v1.ResourceName) bool { if memoryState1.TotalMemSize != memoryState2.TotalMemSize { - klog.ErrorS(nil, "Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "TotalMemSize", "TotalMemSize1", memoryState1.TotalMemSize, "TotalMemSize2", memoryState2.TotalMemSize, "memoryState1", *memoryState1, "memoryState2", *memoryState2) + klog.InfoS("Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "TotalMemSize", "TotalMemSize1", memoryState1.TotalMemSize, "TotalMemSize2", memoryState2.TotalMemSize, "memoryState1", *memoryState1, "memoryState2", *memoryState2) return false } if memoryState1.SystemReserved != memoryState2.SystemReserved { - klog.ErrorS(nil, "Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "SystemReserved", "SystemReserved1", memoryState1.SystemReserved, "SystemReserved2", memoryState2.SystemReserved, "memoryState1", *memoryState1, "memoryState2", *memoryState2) + klog.InfoS("Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "SystemReserved", "SystemReserved1", memoryState1.SystemReserved, "SystemReserved2", memoryState2.SystemReserved, "memoryState1", *memoryState1, "memoryState2", *memoryState2) return false } if memoryState1.Allocatable != memoryState2.Allocatable { - klog.ErrorS(nil, "Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "Allocatable", "Allocatable1", memoryState1.Allocatable, "Allocatable2", memoryState2.Allocatable, "memoryState1", *memoryState1, "memoryState2", *memoryState2) + klog.InfoS("Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "Allocatable", "Allocatable1", memoryState1.Allocatable, "Allocatable2", memoryState2.Allocatable, "memoryState1", *memoryState1, "memoryState2", *memoryState2) return false } return true From 34fd61a3ef1e6a8744ea954590bb108cbd38b49c Mon Sep 17 00:00:00 2001 From: Swati Sehgal Date: Thu, 16 Jan 2025 10:51:56 +0000 Subject: [PATCH 2/7] node: memory-mgr: Add metadata to logs Ensure that whereever possible, we provide sufficient metadata inclusing pod name and UID to allow filtering by pod name or its UID. Signed-off-by: Swati Sehgal --- pkg/kubelet/cm/memorymanager/memory_manager.go | 2 +- pkg/kubelet/cm/memorymanager/policy_static.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/cm/memorymanager/memory_manager.go b/pkg/kubelet/cm/memorymanager/memory_manager.go index d09a21ad1a2..9c6f6235c0a 100644 --- a/pkg/kubelet/cm/memorymanager/memory_manager.go +++ b/pkg/kubelet/cm/memorymanager/memory_manager.go @@ -266,7 +266,7 @@ func (m *manager) Allocate(pod *v1.Pod, container *v1.Container) error { // Call down into the policy to assign this container memory if required. if err := m.policy.Allocate(m.state, pod, container); err != nil { - klog.ErrorS(err, "Allocate error") + klog.ErrorS(err, "Allocate error", "pod", klog.KObj(pod), "containerName", container.Name) return err } return nil diff --git a/pkg/kubelet/cm/memorymanager/policy_static.go b/pkg/kubelet/cm/memorymanager/policy_static.go index 9187900dfd5..bfe704a1f8d 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static.go +++ b/pkg/kubelet/cm/memorymanager/policy_static.go @@ -304,24 +304,24 @@ func regenerateHints(pod *v1.Pod, ctn *v1.Container, ctnBlocks []state.Block, re } if len(ctnBlocks) != len(reqRsrc) { - klog.InfoS("The number of requested resources by the container differs from the number of memory blocks", "containerName", ctn.Name) + klog.InfoS("The number of requested resources by the container differs from the number of memory blocks", "pod", klog.KObj(pod), "containerName", ctn.Name) return nil } for _, b := range ctnBlocks { if _, ok := reqRsrc[b.Type]; !ok { - klog.InfoS("Container requested resources do not have resource of this type", "containerName", ctn.Name, "type", b.Type) + klog.InfoS("Container requested resources do not have resource of this type", "pod", klog.KObj(pod), "containerName", ctn.Name, "type", b.Type) return nil } if b.Size != reqRsrc[b.Type] { - klog.InfoS("Memory already allocated with different numbers than requested", "podUID", pod.UID, "type", b.Type, "containerName", ctn.Name, "requestedResource", reqRsrc[b.Type], "allocatedSize", b.Size) + klog.InfoS("Memory already allocated with different numbers than requested", "pod", klog.KObj(pod), "containerName", ctn.Name, "type", b.Type, "requestedResource", reqRsrc[b.Type], "allocatedSize", b.Size) return nil } containerNUMAAffinity, err := bitmask.NewBitMask(b.NUMAAffinity...) if err != nil { - klog.ErrorS(err, "Failed to generate NUMA bitmask") + klog.ErrorS(err, "Failed to generate NUMA bitmask", "pod", klog.KObj(pod), "containerName", ctn.Name, "type", b.Type) return nil } From 07d83acce560fe120f0943e9e33c73f16f71b2f5 Mon Sep 17 00:00:00 2001 From: Swati Sehgal Date: Thu, 16 Jan 2025 11:36:57 +0000 Subject: [PATCH 3/7] node: memory-mgr: Update log levels and add logs to capture state update Signed-off-by: Swati Sehgal --- pkg/kubelet/cm/memorymanager/memory_manager.go | 4 ++-- pkg/kubelet/cm/memorymanager/state/state_mem.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/cm/memorymanager/memory_manager.go b/pkg/kubelet/cm/memorymanager/memory_manager.go index 9c6f6235c0a..343df98f777 100644 --- a/pkg/kubelet/cm/memorymanager/memory_manager.go +++ b/pkg/kubelet/cm/memorymanager/memory_manager.go @@ -344,7 +344,7 @@ func (m *manager) removeStaleState() { for podUID := range assignments { for containerName := range assignments[podUID] { if _, ok := activeContainers[podUID][containerName]; !ok { - klog.InfoS("RemoveStaleState removing state", "podUID", podUID, "containerName", containerName) + klog.V(2).InfoS("RemoveStaleState removing state", "podUID", podUID, "containerName", containerName) m.policyRemoveContainerByRef(podUID, containerName) } } @@ -352,7 +352,7 @@ func (m *manager) removeStaleState() { m.containerMap.Visit(func(podUID, containerName, containerID string) { if _, ok := activeContainers[podUID][containerName]; !ok { - klog.InfoS("RemoveStaleState removing state", "podUID", podUID, "containerName", containerName) + klog.V(2).InfoS("RemoveStaleState removing state", "podUID", podUID, "containerName", containerName) m.policyRemoveContainerByRef(podUID, containerName) } }) diff --git a/pkg/kubelet/cm/memorymanager/state/state_mem.go b/pkg/kubelet/cm/memorymanager/state/state_mem.go index 7e4da7ab67c..19861c6e35a 100644 --- a/pkg/kubelet/cm/memorymanager/state/state_mem.go +++ b/pkg/kubelet/cm/memorymanager/state/state_mem.go @@ -94,6 +94,7 @@ func (s *stateMemory) SetMemoryAssignments(assignments ContainerMemoryAssignment defer s.Unlock() s.assignments = assignments.Clone() + klog.V(5).InfoS("Updated Memory assignments", "assignments", assignments) } // Delete deletes corresponding Blocks from ContainerMemoryAssignments From ee7f2616c62d769d1acf6aeae3ac43d4e34ee6f6 Mon Sep 17 00:00:00 2001 From: Swati Sehgal Date: Thu, 16 Jan 2025 12:45:01 +0000 Subject: [PATCH 4/7] node: memory-mgr: Update klog.Infof(..., err) to klog.ErrorS(err,...) Signed-off-by: Swati Sehgal --- pkg/kubelet/cm/memorymanager/memory_manager.go | 2 +- pkg/kubelet/cm/memorymanager/state/state_checkpoint.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/cm/memorymanager/memory_manager.go b/pkg/kubelet/cm/memorymanager/memory_manager.go index 343df98f777..eb0821869f8 100644 --- a/pkg/kubelet/cm/memorymanager/memory_manager.go +++ b/pkg/kubelet/cm/memorymanager/memory_manager.go @@ -280,7 +280,7 @@ func (m *manager) RemoveContainer(containerID string) error { // if error appears it means container entry already does not exist under the container map podUID, containerName, err := m.containerMap.GetContainerRef(containerID) if err != nil { - klog.InfoS("Failed to get container from container map", "containerID", containerID, "err", err) + klog.ErrorS(err, "Failed to get container from container map", "containerID", containerID) return nil } diff --git a/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go b/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go index 05e32b751a6..78b07b09582 100644 --- a/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go +++ b/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go @@ -131,7 +131,7 @@ func (sc *stateCheckpoint) SetMachineState(memoryMap NUMANodeMap) { sc.cache.SetMachineState(memoryMap) err := sc.storeState() if err != nil { - klog.InfoS("Store state to checkpoint error", "err", err) + klog.ErrorS(err, "Store state to checkpoint error") } } @@ -143,7 +143,7 @@ func (sc *stateCheckpoint) SetMemoryBlocks(podUID string, containerName string, sc.cache.SetMemoryBlocks(podUID, containerName, blocks) err := sc.storeState() if err != nil { - klog.InfoS("Store state to checkpoint error", "err", err) + klog.ErrorS(err, "Store state to checkpoint error", "podUID", podUID, "containerName", containerName) } } @@ -155,7 +155,7 @@ func (sc *stateCheckpoint) SetMemoryAssignments(assignments ContainerMemoryAssig sc.cache.SetMemoryAssignments(assignments) err := sc.storeState() if err != nil { - klog.InfoS("Store state to checkpoint error", "err", err) + klog.ErrorS(err, "Store state to checkpoint error") } } @@ -167,7 +167,7 @@ func (sc *stateCheckpoint) Delete(podUID string, containerName string) { sc.cache.Delete(podUID, containerName) err := sc.storeState() if err != nil { - klog.InfoS("Store state to checkpoint error", "err", err) + klog.ErrorS(err, "Store state to checkpoint error", "podUID", podUID, "containerName", containerName) } } @@ -179,6 +179,6 @@ func (sc *stateCheckpoint) ClearState() { sc.cache.ClearState() err := sc.storeState() if err != nil { - klog.InfoS("Store state to checkpoint error", "err", err) + klog.ErrorS(err, "Store state to checkpoint error") } } From 6240febf4c58ddee3647434d3279db26795d59cb Mon Sep 17 00:00:00 2001 From: Swati Sehgal Date: Fri, 17 Jan 2025 11:49:51 +0000 Subject: [PATCH 5/7] node:memory-mgr: Add logs on the happy path We have reasonable amount of logs when things go wrong. While debugging, it can be useful to have logs to indicate that things have gone as expected especially when it comes to important events like successful startup of memory manager and successful allocation of resources. Signed-off-by: Swati Sehgal --- pkg/kubelet/cm/memorymanager/memory_manager.go | 1 + pkg/kubelet/cm/memorymanager/policy_static.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/kubelet/cm/memorymanager/memory_manager.go b/pkg/kubelet/cm/memorymanager/memory_manager.go index eb0821869f8..996ac951326 100644 --- a/pkg/kubelet/cm/memorymanager/memory_manager.go +++ b/pkg/kubelet/cm/memorymanager/memory_manager.go @@ -205,6 +205,7 @@ func (m *manager) Start(activePods ActivePodsFunc, sourcesReady config.SourcesRe m.allocatableMemory = m.policy.GetAllocatableMemory(m.state) + klog.V(4).InfoS("memorymanager started", "policy", m.policy.Name()) return nil } diff --git a/pkg/kubelet/cm/memorymanager/policy_static.go b/pkg/kubelet/cm/memorymanager/policy_static.go index bfe704a1f8d..62db4bdc1d0 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static.go +++ b/pkg/kubelet/cm/memorymanager/policy_static.go @@ -196,6 +196,7 @@ func (p *staticPolicy) Allocate(s state.State, pod *v1.Pod, container *v1.Contai // TODO: we should refactor our state structs to reflect the amount of the re-used memory p.updateInitContainersMemoryBlocks(s, pod, container, containerBlocks) + klog.V(4).InfoS("Allocated exclusive memory", "pod", klog.KObj(pod), "containerName", container.Name) return nil } From a10b3c355596bcdb1d4f37bb756647ce88fedea5 Mon Sep 17 00:00:00 2001 From: Swati Sehgal Date: Fri, 17 Jan 2025 11:54:34 +0000 Subject: [PATCH 6/7] node: memory-mgr: Add logs when memory allocation is skipped due to QoS Signed-off-by: Swati Sehgal --- pkg/kubelet/cm/memorymanager/policy_static.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/cm/memorymanager/policy_static.go b/pkg/kubelet/cm/memorymanager/policy_static.go index 62db4bdc1d0..5b51d3a0c28 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static.go +++ b/pkg/kubelet/cm/memorymanager/policy_static.go @@ -96,7 +96,9 @@ func (p *staticPolicy) Start(s state.State) error { // Allocate call is idempotent func (p *staticPolicy) Allocate(s state.State, pod *v1.Pod, container *v1.Container) (rerr error) { // allocate the memory only for guaranteed pods - if v1qos.GetPodQOS(pod) != v1.PodQOSGuaranteed { + qos := v1qos.GetPodQOS(pod) + if qos != v1.PodQOSGuaranteed { + klog.V(5).InfoS("Exclusive memory allocation skipped, pod QoS is not guaranteed", "pod", klog.KObj(pod), "containerName", container.Name, "qos", qos) return nil } From ecd67e25373751db806d81d95209df247974e3c4 Mon Sep 17 00:00:00 2001 From: Swati Sehgal Date: Thu, 6 Feb 2025 15:50:43 +0000 Subject: [PATCH 7/7] node: memory-mgr: Adhere to the message style guidelines Ensure that the log messages adhere to the message style guildelines as captured [here](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/logging.md#message-style-guidelines). Signed-off-by: Swati Sehgal --- pkg/kubelet/cm/memorymanager/memory_manager.go | 2 +- pkg/kubelet/cm/memorymanager/policy_static.go | 18 +++++++++--------- .../cm/memorymanager/state/state_checkpoint.go | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/kubelet/cm/memorymanager/memory_manager.go b/pkg/kubelet/cm/memorymanager/memory_manager.go index 996ac951326..448539fc0cd 100644 --- a/pkg/kubelet/cm/memorymanager/memory_manager.go +++ b/pkg/kubelet/cm/memorymanager/memory_manager.go @@ -249,7 +249,7 @@ func (m *manager) GetMemoryNUMANodes(pod *v1.Pod, container *v1.Container) sets. } if numaNodes.Len() == 0 { - klog.V(5).InfoS("No allocation is available", "pod", klog.KObj(pod), "containerName", container.Name) + klog.V(5).InfoS("NUMA nodes not available for allocation", "pod", klog.KObj(pod), "containerName", container.Name) return nil } diff --git a/pkg/kubelet/cm/memorymanager/policy_static.go b/pkg/kubelet/cm/memorymanager/policy_static.go index 5b51d3a0c28..6c6e2d3b881 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static.go +++ b/pkg/kubelet/cm/memorymanager/policy_static.go @@ -313,7 +313,7 @@ func regenerateHints(pod *v1.Pod, ctn *v1.Container, ctnBlocks []state.Block, re for _, b := range ctnBlocks { if _, ok := reqRsrc[b.Type]; !ok { - klog.InfoS("Container requested resources do not have resource of this type", "pod", klog.KObj(pod), "containerName", ctn.Name, "type", b.Type) + klog.InfoS("Container requested resources but none available of this type", "pod", klog.KObj(pod), "containerName", ctn.Name, "type", b.Type) return nil } @@ -657,36 +657,36 @@ func (p *staticPolicy) validateState(s state.State) error { func areMachineStatesEqual(ms1, ms2 state.NUMANodeMap) bool { if len(ms1) != len(ms2) { - klog.InfoS("Node states are different", "lengthNode1", len(ms1), "lengthNode2", len(ms2)) + klog.InfoS("Node states were different", "lengthNode1", len(ms1), "lengthNode2", len(ms2)) return false } for nodeID, nodeState1 := range ms1 { nodeState2, ok := ms2[nodeID] if !ok { - klog.InfoS("Node state does not have node ID", "nodeID", nodeID) + klog.InfoS("Node state didn't have node ID", "nodeID", nodeID) return false } if nodeState1.NumberOfAssignments != nodeState2.NumberOfAssignments { - klog.InfoS("Node states number of assignments are different", "assignment1", nodeState1.NumberOfAssignments, "assignment2", nodeState2.NumberOfAssignments) + klog.InfoS("Node state had a different number of memory assignments.", "assignment1", nodeState1.NumberOfAssignments, "assignment2", nodeState2.NumberOfAssignments) return false } if !areGroupsEqual(nodeState1.Cells, nodeState2.Cells) { - klog.InfoS("Node states groups are different", "stateNode1", nodeState1.Cells, "stateNode2", nodeState2.Cells) + klog.InfoS("Node states had different groups", "stateNode1", nodeState1.Cells, "stateNode2", nodeState2.Cells) return false } if len(nodeState1.MemoryMap) != len(nodeState2.MemoryMap) { - klog.InfoS("Node states memory map have different lengths", "lengthNode1", len(nodeState1.MemoryMap), "lengthNode2", len(nodeState2.MemoryMap)) + klog.InfoS("Node state had memory maps of different lengths", "lengthNode1", len(nodeState1.MemoryMap), "lengthNode2", len(nodeState2.MemoryMap)) return false } for resourceName, memoryState1 := range nodeState1.MemoryMap { memoryState2, ok := nodeState2.MemoryMap[resourceName] if !ok { - klog.InfoS("Memory state does not have resource", "resource", resourceName) + klog.InfoS("Memory state didn't have resource", "resource", resourceName) return false } @@ -704,11 +704,11 @@ func areMachineStatesEqual(ms1, ms2 state.NUMANodeMap) bool { } if tmpState1.Free != tmpState2.Free { - klog.InfoS("Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "free", "free1", tmpState1.Free, "free2", tmpState2.Free, "memoryState1", *memoryState1, "memoryState2", *memoryState2) + klog.InfoS("NUMA node and resource had different memory states", "node", nodeID, "resource", resourceName, "field", "free", "free1", tmpState1.Free, "free2", tmpState2.Free, "memoryState1", *memoryState1, "memoryState2", *memoryState2) return false } if tmpState1.Reserved != tmpState2.Reserved { - klog.InfoS("Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "field", "reserved", "reserved1", tmpState1.Reserved, "reserved2", tmpState2.Reserved, "memoryState1", *memoryState1, "memoryState2", *memoryState2) + klog.InfoS("NUMA node and resource had different memory states", "node", nodeID, "resource", resourceName, "field", "reserved", "reserved1", tmpState1.Reserved, "reserved2", tmpState2.Reserved, "memoryState1", *memoryState1, "memoryState2", *memoryState2) return false } } diff --git a/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go b/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go index 78b07b09582..dce0bda55a3 100644 --- a/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go +++ b/pkg/kubelet/cm/memorymanager/state/state_checkpoint.go @@ -131,7 +131,7 @@ func (sc *stateCheckpoint) SetMachineState(memoryMap NUMANodeMap) { sc.cache.SetMachineState(memoryMap) err := sc.storeState() if err != nil { - klog.ErrorS(err, "Store state to checkpoint error") + klog.ErrorS(err, "Failed to store state to checkpoint") } } @@ -143,7 +143,7 @@ func (sc *stateCheckpoint) SetMemoryBlocks(podUID string, containerName string, sc.cache.SetMemoryBlocks(podUID, containerName, blocks) err := sc.storeState() if err != nil { - klog.ErrorS(err, "Store state to checkpoint error", "podUID", podUID, "containerName", containerName) + klog.ErrorS(err, "Failed to store state to checkpoint", "podUID", podUID, "containerName", containerName) } } @@ -155,7 +155,7 @@ func (sc *stateCheckpoint) SetMemoryAssignments(assignments ContainerMemoryAssig sc.cache.SetMemoryAssignments(assignments) err := sc.storeState() if err != nil { - klog.ErrorS(err, "Store state to checkpoint error") + klog.ErrorS(err, "Failed to store state to checkpoint") } } @@ -167,7 +167,7 @@ func (sc *stateCheckpoint) Delete(podUID string, containerName string) { sc.cache.Delete(podUID, containerName) err := sc.storeState() if err != nil { - klog.ErrorS(err, "Store state to checkpoint error", "podUID", podUID, "containerName", containerName) + klog.ErrorS(err, "Failed to store state to checkpoint", "podUID", podUID, "containerName", containerName) } } @@ -179,6 +179,6 @@ func (sc *stateCheckpoint) ClearState() { sc.cache.ClearState() err := sc.storeState() if err != nil { - klog.ErrorS(err, "Store state to checkpoint error") + klog.ErrorS(err, "Failed to store state to checkpoint") } }