Skip to content

Commit 6709317

Browse files
donggangcjTal-or
authored andcommitted
chore: optimize code logic
(cherry picked from commit 91a9a19)
1 parent 6d7a122 commit 6709317

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

pkg/kubelet/cm/memorymanager/policy_static.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -681,17 +681,7 @@ func areMachineStatesEqual(ms1, ms2 state.NUMANodeMap) bool {
681681
return false
682682
}
683683

684-
if memoryState1.TotalMemSize != memoryState2.TotalMemSize {
685-
klog.ErrorS(nil, "Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "memoryState1", *memoryState1, "memoryState2", *memoryState2)
686-
return false
687-
}
688-
689-
if memoryState1.SystemReserved != memoryState2.SystemReserved {
690-
klog.ErrorS(nil, "Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "memoryState1", *memoryState1, "memoryState2", *memoryState2)
691-
return false
692-
}
693-
694-
if memoryState1.Allocatable != memoryState2.Allocatable {
684+
if memoryState1.TotalMemSize != memoryState2.TotalMemSize || memoryState1.SystemReserved != memoryState2.SystemReserved || memoryState1.Allocatable != memoryState2.Allocatable {
695685
klog.ErrorS(nil, "Memory states for the NUMA node and resource are different", "node", nodeID, "resource", resourceName, "memoryState1", *memoryState1, "memoryState2", *memoryState2)
696686
return false
697687
}

0 commit comments

Comments
 (0)