From 8e1d35cb3ce53b8d9225015037fb04493939968b Mon Sep 17 00:00:00 2001 From: Amir Alavi Date: Wed, 1 Jun 2022 11:28:09 -0400 Subject: [PATCH 1/2] Revert "cleanup lownodeutilization code" --- .../nodeutilization/lownodeutilization.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go b/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go index 74f184393..5579a6d6e 100644 --- a/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go +++ b/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go @@ -118,6 +118,20 @@ func LowNodeUtilization(ctx context.Context, client clientset.Interface, strateg klog.V(1).InfoS("Criteria for a node under utilization", keysAndValues...) klog.V(1).InfoS("Number of underutilized nodes", "totalNumber", len(lowNodes)) + // log message in one line + keysAndValues = []interface{}{ + "CPU", targetThresholds[v1.ResourceCPU], + "Mem", targetThresholds[v1.ResourceMemory], + "Pods", targetThresholds[v1.ResourcePods], + } + for name := range targetThresholds { + if !nodeutil.IsBasicResource(name) { + keysAndValues = append(keysAndValues, string(name), int64(targetThresholds[name])) + } + } + klog.V(1).InfoS("Criteria for a node above target utilization", keysAndValues...) + klog.V(1).InfoS("Number of overutilized nodes", "totalNumber", len(sourceNodes)) + if len(lowNodes) == 0 { klog.V(1).InfoS("No node is underutilized, nothing to do here, you might tune your thresholds further") return From 3cc0a68f1391ceae6098df541b7a73699677434d Mon Sep 17 00:00:00 2001 From: Amir Alavi Date: Wed, 1 Jun 2022 11:39:38 -0400 Subject: [PATCH 2/2] lownodeutilization: clarify comments and variable naming for underutilized vs. overutilized --- .../nodeutilization/lownodeutilization.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go b/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go index 5579a6d6e..283ee3b8d 100644 --- a/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go +++ b/pkg/descheduler/strategies/nodeutilization/lownodeutilization.go @@ -104,32 +104,32 @@ func LowNodeUtilization(ctx context.Context, client clientset.Interface, strateg }, ) - // log message in one line - keysAndValues := []interface{}{ + // log message for nodes with low utilization + underutilizationCriteria := []interface{}{ "CPU", thresholds[v1.ResourceCPU], "Mem", thresholds[v1.ResourceMemory], "Pods", thresholds[v1.ResourcePods], } for name := range thresholds { if !nodeutil.IsBasicResource(name) { - keysAndValues = append(keysAndValues, string(name), int64(thresholds[name])) + underutilizationCriteria = append(underutilizationCriteria, string(name), int64(thresholds[name])) } } - klog.V(1).InfoS("Criteria for a node under utilization", keysAndValues...) + klog.V(1).InfoS("Criteria for a node under utilization", underutilizationCriteria...) klog.V(1).InfoS("Number of underutilized nodes", "totalNumber", len(lowNodes)) - // log message in one line - keysAndValues = []interface{}{ + // log message for over utilized nodes + overutilizationCriteria := []interface{}{ "CPU", targetThresholds[v1.ResourceCPU], "Mem", targetThresholds[v1.ResourceMemory], "Pods", targetThresholds[v1.ResourcePods], } for name := range targetThresholds { if !nodeutil.IsBasicResource(name) { - keysAndValues = append(keysAndValues, string(name), int64(targetThresholds[name])) + overutilizationCriteria = append(overutilizationCriteria, string(name), int64(targetThresholds[name])) } } - klog.V(1).InfoS("Criteria for a node above target utilization", keysAndValues...) + klog.V(1).InfoS("Criteria for a node above target utilization", overutilizationCriteria...) klog.V(1).InfoS("Number of overutilized nodes", "totalNumber", len(sourceNodes)) if len(lowNodes) == 0 {