Merge pull request #1362 from jackfrancis/pod-fit-logs

k8s-ci-robot · web-flow · commit dc2cf723bc0b · 2024-03-08T20:21:38.000-08:00
Disambiguate node fit log messages
diff --git a/pkg/descheduler/node/node.go b/pkg/descheduler/node/node.go
@@ -147,7 +147,7 @@ func PodFitsAnyOtherNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.
 			klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
 			return true
 		}
-		klog.V(4).InfoS("Pod does not fit on node",
+		klog.V(4).InfoS("Pod does not fit on any other node",
 			"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())
 	}
 
@@ -163,7 +163,7 @@ func PodFitsAnyNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod,
 			klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
 			return true
 		}
-		klog.V(4).InfoS("Pod does not fit on node",
+		klog.V(4).InfoS("Pod does not fit on any node",
 			"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())
 	}
 
@@ -179,7 +179,7 @@ func PodFitsCurrentNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.P
 		return true
 	}
 
-	klog.V(4).InfoS("Pod does not fit on node",
+	klog.V(4).InfoS("Pod does not fit on current node",
 		"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())
 
 	return false

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func PodFitsAnyOtherNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.`
`147`	`147`	`klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))`
`148`	`148`	`return true`
`149`	`149`	`}`
`150`		`- klog.V(4).InfoS("Pod does not fit on node",`
	`150`	`+ klog.V(4).InfoS("Pod does not fit on any other node",`
`151`	`151`	`"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())`
`152`	`152`	`}`
`153`	`153`
`@@ -163,7 +163,7 @@ func PodFitsAnyNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod,`
`163`	`163`	`klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))`
`164`	`164`	`return true`
`165`	`165`	`}`
`166`		`- klog.V(4).InfoS("Pod does not fit on node",`
	`166`	`+ klog.V(4).InfoS("Pod does not fit on any node",`
`167`	`167`	`"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())`
`168`	`168`	`}`
`169`	`169`
`@@ -179,7 +179,7 @@ func PodFitsCurrentNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.P`
`179`	`179`	`return true`
`180`	`180`	`}`
`181`	`181`
`182`		`- klog.V(4).InfoS("Pod does not fit on node",`
	`182`	`+ klog.V(4).InfoS("Pod does not fit on current node",`
`183`	`183`	`"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())`
`184`	`184`
`185`	`185`	`return false`