From 41b696bae69bee2b9b71616482346c7353733ee1 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Fri, 11 Aug 2017 14:57:50 -0400 Subject: [PATCH] Fix thresholds logic. --- .../strategies/lownodeutilization.go | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkg/rescheduler/strategies/lownodeutilization.go b/pkg/rescheduler/strategies/lownodeutilization.go index 76d94df70..0a5f15ba9 100644 --- a/pkg/rescheduler/strategies/lownodeutilization.go +++ b/pkg/rescheduler/strategies/lownodeutilization.go @@ -36,19 +36,21 @@ func LowNodeUtilization(client clientset.Interface, strategy api.ReschedulerStra return } - npm := CreateNodePodsMap(client, nodes) - lowNodes, otherNodes := []*v1.Node{}, []*v1.Node{} thresholds := strategy.Params.NodeResourceUtilizationThresholds.Thresholds if thresholds != nil { - nodeUsageMap := NodeUsageMap{} - for node, pods := range npm { - nodeUsageMap[node] = NodeUtilization(node, pods) - fmt.Printf("Node %#v usage: %#v\n", node.Name, nodeUsageMap[node]) - if IsNodeWithLowUtilization(nodeUsageMap[node], thresholds) { - lowNodes = append(lowNodes, node) - } else { - otherNodes = append(otherNodes, node) - } + return + } + + npm := CreateNodePodsMap(client, nodes) + lowNodes, otherNodes := []*v1.Node{}, []*v1.Node{} + nodeUsageMap := NodeUsageMap{} + for node, pods := range npm { + nodeUsageMap[node] = NodeUtilization(node, pods) + fmt.Printf("Node %#v usage: %#v\n", node.Name, nodeUsageMap[node]) + if IsNodeWithLowUtilization(nodeUsageMap[node], thresholds) { + lowNodes = append(lowNodes, node) + } else { + otherNodes = append(otherNodes, node) } }