Skip to content

Commit ecd67e2

Browse files
committed
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 <[email protected]>
1 parent a10b3c3 commit ecd67e2

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

pkg/kubelet/cm/memorymanager/memory_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (m *manager) GetMemoryNUMANodes(pod *v1.Pod, container *v1.Container) sets.
249249
}
250250

251251
if numaNodes.Len() == 0 {
252-
klog.V(5).InfoS("No allocation is available", "pod", klog.KObj(pod), "containerName", container.Name)
252+
klog.V(5).InfoS("NUMA nodes not available for allocation", "pod", klog.KObj(pod), "containerName", container.Name)
253253
return nil
254254
}
255255

pkg/kubelet/cm/memorymanager/policy_static.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func regenerateHints(pod *v1.Pod, ctn *v1.Container, ctnBlocks []state.Block, re
313313

314314
for _, b := range ctnBlocks {
315315
if _, ok := reqRsrc[b.Type]; !ok {
316-
klog.InfoS("Container requested resources do not have resource of this type", "pod", klog.KObj(pod), "containerName", ctn.Name, "type", b.Type)
316+
klog.InfoS("Container requested resources but none available of this type", "pod", klog.KObj(pod), "containerName", ctn.Name, "type", b.Type)
317317
return nil
318318
}
319319

@@ -657,36 +657,36 @@ func (p *staticPolicy) validateState(s state.State) error {
657657

658658
func areMachineStatesEqual(ms1, ms2 state.NUMANodeMap) bool {
659659
if len(ms1) != len(ms2) {
660-
klog.InfoS("Node states are different", "lengthNode1", len(ms1), "lengthNode2", len(ms2))
660+
klog.InfoS("Node states were different", "lengthNode1", len(ms1), "lengthNode2", len(ms2))
661661
return false
662662
}
663663

664664
for nodeID, nodeState1 := range ms1 {
665665
nodeState2, ok := ms2[nodeID]
666666
if !ok {
667-
klog.InfoS("Node state does not have node ID", "nodeID", nodeID)
667+
klog.InfoS("Node state didn't have node ID", "nodeID", nodeID)
668668
return false
669669
}
670670

671671
if nodeState1.NumberOfAssignments != nodeState2.NumberOfAssignments {
672-
klog.InfoS("Node states number of assignments are different", "assignment1", nodeState1.NumberOfAssignments, "assignment2", nodeState2.NumberOfAssignments)
672+
klog.InfoS("Node state had a different number of memory assignments.", "assignment1", nodeState1.NumberOfAssignments, "assignment2", nodeState2.NumberOfAssignments)
673673
return false
674674
}
675675

676676
if !areGroupsEqual(nodeState1.Cells, nodeState2.Cells) {
677-
klog.InfoS("Node states groups are different", "stateNode1", nodeState1.Cells, "stateNode2", nodeState2.Cells)
677+
klog.InfoS("Node states had different groups", "stateNode1", nodeState1.Cells, "stateNode2", nodeState2.Cells)
678678
return false
679679
}
680680

681681
if len(nodeState1.MemoryMap) != len(nodeState2.MemoryMap) {
682-
klog.InfoS("Node states memory map have different lengths", "lengthNode1", len(nodeState1.MemoryMap), "lengthNode2", len(nodeState2.MemoryMap))
682+
klog.InfoS("Node state had memory maps of different lengths", "lengthNode1", len(nodeState1.MemoryMap), "lengthNode2", len(nodeState2.MemoryMap))
683683
return false
684684
}
685685

686686
for resourceName, memoryState1 := range nodeState1.MemoryMap {
687687
memoryState2, ok := nodeState2.MemoryMap[resourceName]
688688
if !ok {
689-
klog.InfoS("Memory state does not have resource", "resource", resourceName)
689+
klog.InfoS("Memory state didn't have resource", "resource", resourceName)
690690
return false
691691
}
692692

@@ -704,11 +704,11 @@ func areMachineStatesEqual(ms1, ms2 state.NUMANodeMap) bool {
704704
}
705705

706706
if tmpState1.Free != tmpState2.Free {
707-
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)
707+
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)
708708
return false
709709
}
710710
if tmpState1.Reserved != tmpState2.Reserved {
711-
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)
711+
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)
712712
return false
713713
}
714714
}

pkg/kubelet/cm/memorymanager/state/state_checkpoint.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (sc *stateCheckpoint) SetMachineState(memoryMap NUMANodeMap) {
131131
sc.cache.SetMachineState(memoryMap)
132132
err := sc.storeState()
133133
if err != nil {
134-
klog.ErrorS(err, "Store state to checkpoint error")
134+
klog.ErrorS(err, "Failed to store state to checkpoint")
135135
}
136136
}
137137

@@ -143,7 +143,7 @@ func (sc *stateCheckpoint) SetMemoryBlocks(podUID string, containerName string,
143143
sc.cache.SetMemoryBlocks(podUID, containerName, blocks)
144144
err := sc.storeState()
145145
if err != nil {
146-
klog.ErrorS(err, "Store state to checkpoint error", "podUID", podUID, "containerName", containerName)
146+
klog.ErrorS(err, "Failed to store state to checkpoint", "podUID", podUID, "containerName", containerName)
147147
}
148148
}
149149

@@ -155,7 +155,7 @@ func (sc *stateCheckpoint) SetMemoryAssignments(assignments ContainerMemoryAssig
155155
sc.cache.SetMemoryAssignments(assignments)
156156
err := sc.storeState()
157157
if err != nil {
158-
klog.ErrorS(err, "Store state to checkpoint error")
158+
klog.ErrorS(err, "Failed to store state to checkpoint")
159159
}
160160
}
161161

@@ -167,7 +167,7 @@ func (sc *stateCheckpoint) Delete(podUID string, containerName string) {
167167
sc.cache.Delete(podUID, containerName)
168168
err := sc.storeState()
169169
if err != nil {
170-
klog.ErrorS(err, "Store state to checkpoint error", "podUID", podUID, "containerName", containerName)
170+
klog.ErrorS(err, "Failed to store state to checkpoint", "podUID", podUID, "containerName", containerName)
171171
}
172172
}
173173

@@ -179,6 +179,6 @@ func (sc *stateCheckpoint) ClearState() {
179179
sc.cache.ClearState()
180180
err := sc.storeState()
181181
if err != nil {
182-
klog.ErrorS(err, "Store state to checkpoint error")
182+
klog.ErrorS(err, "Failed to store state to checkpoint")
183183
}
184184
}

0 commit comments

Comments
 (0)