Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 05:14:13 +01:00
Code Packages Releases Activity

Merge pull request #1549 from ingvagabund/usageKeysAndValues

Browse Source 
nodeutilization: usage2KeysAndValues for constructing a key:value list for InfoS printing resource usage
This commit is contained in:
Kubernetes Prow Robot
2024-11-14 14:30:52 +00:00
committed by GitHub
parent af8a7445a4 9950b8a55d
commit 23a6d26209
1 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/framework/plugins/nodeutilization/nodeutilization.go
View File

@@ -226,6 +226,26 @@ func classifyNodes(
return lowNodes, highNodes return lowNodes, highNodes
} }
func usageToKeysAndValues(usage map[v1.ResourceName]*resource.Quantity) []interface{} {
// log message in one line
keysAndValues := []interface{}{}
if quantity, exists := usage[v1.ResourceCPU]; exists {
keysAndValues = append(keysAndValues, "CPU", quantity.MilliValue())
}
if quantity, exists := usage[v1.ResourceMemory]; exists {
keysAndValues = append(keysAndValues, "Mem", quantity.Value())
}
if quantity, exists := usage[v1.ResourcePods]; exists {
keysAndValues = append(keysAndValues, "Pods", quantity.Value())
}
for name := range usage {
if !node.IsBasicResource(name) {
keysAndValues = append(keysAndValues, string(name), usage[name].Value())
}
}
return keysAndValues
}
// evictPodsFromSourceNodes evicts pods based on priority, if all the pods on the node have priority, if not // evictPodsFromSourceNodes evicts pods based on priority, if all the pods on the node have priority, if not
// evicts them based on QoS as fallback option. // evicts them based on QoS as fallback option.
// TODO: @ravig Break this function into smaller functions. // TODO: @ravig Break this function into smaller functions.
@@ -259,22 +279,7 @@ func evictPodsFromSourceNodes(
} }
// log message in one line // log message in one line
keysAndValues := []interface{}{} klog.V(1).InfoS("Total capacity to be moved", usageToKeysAndValues(totalAvailableUsage)...)
if quantity, exists := totalAvailableUsage[v1.ResourceCPU]; exists {
keysAndValues = append(keysAndValues, "CPU", quantity.MilliValue())
}
if quantity, exists := totalAvailableUsage[v1.ResourceMemory]; exists {
keysAndValues = append(keysAndValues, "Mem", quantity.Value())
}
if quantity, exists := totalAvailableUsage[v1.ResourcePods]; exists {
keysAndValues = append(keysAndValues, "Pods", quantity.Value())
}
for name := range totalAvailableUsage {
if !node.IsBasicResource(name) {
keysAndValues = append(keysAndValues, string(name), totalAvailableUsage[name].Value())
}
}
klog.V(1).InfoS("Total capacity to be moved", keysAndValues...)
for _, node := range sourceNodes { for _, node := range sourceNodes {
klog.V(3).InfoS("Evicting pods from node", "node", klog.KObj(node.node), "usage", node.usage) klog.V(3).InfoS("Evicting pods from node", "node", klog.KObj(node.node), "usage", node.usage)
@@ -354,21 +359,7 @@ func evictPods(
keysAndValues := []interface{}{ keysAndValues := []interface{}{
"node", nodeInfo.node.Name, "node", nodeInfo.node.Name,
} }
if quantity, exists := nodeInfo.usage[v1.ResourceCPU]; exists { keysAndValues = append(keysAndValues, usageToKeysAndValues(nodeInfo.usage)...)
keysAndValues = append(keysAndValues, "CPU", quantity.MilliValue())
}
if quantity, exists := nodeInfo.usage[v1.ResourceMemory]; exists {
keysAndValues = append(keysAndValues, "Mem", quantity.Value())
}
if quantity, exists := nodeInfo.usage[v1.ResourcePods]; exists {
keysAndValues = append(keysAndValues, "Pods", quantity.Value())
}
for name := range totalAvailableUsage {
if !nodeutil.IsBasicResource(name) {
keysAndValues = append(keysAndValues, string(name), totalAvailableUsage[name].Value())
}
}
klog.V(3).InfoS("Updated node usage", keysAndValues...) klog.V(3).InfoS("Updated node usage", keysAndValues...)
// check if pods can be still evicted // check if pods can be still evicted
if !continueEviction(nodeInfo, totalAvailableUsage) { if !continueEviction(nodeInfo, totalAvailableUsage) {