cleanup: remove isUnschedPodUpdateIncluded variable

sanposhiho · sanposhiho · commit 66245418933b · 2024-10-09T18:52:11.000+09:00
diff --git a/pkg/scheduler/eventhandlers.go b/pkg/scheduler/eventhandlers.go
@@ -142,17 +142,12 @@ func (sched *Scheduler) updatePodInSchedulingQueue(oldObj, newObj interface{}) {
 		return
 	}
 
-	isUnschedPodUpdateIncluded := false
+	defer metrics.EventHandlingLatency.WithLabelValues(framework.UnscheduledPodUpdate.Label).Observe(metrics.SinceInSeconds(start))
 	for _, evt := range framework.PodSchedulingPropertiesChange(newPod, oldPod) {
-		defer metrics.EventHandlingLatency.WithLabelValues(evt.Label).Observe(metrics.SinceInSeconds(start))
-		if evt.Label == framework.UnscheduledPodUpdate.Label {
-			isUnschedPodUpdateIncluded = true
+		if evt.Label != framework.UnscheduledPodUpdate.Label {
+			defer metrics.EventHandlingLatency.WithLabelValues(evt.Label).Observe(metrics.SinceInSeconds(start))
 		}
 	}
-	if !isUnschedPodUpdateIncluded {
-		// make sure we always record the latency with UnscheduledPodUpdate label.
-		defer metrics.EventHandlingLatency.WithLabelValues(framework.UnscheduledPodUpdate.Label).Observe(metrics.SinceInSeconds(start))
-	}
 
 	isAssumed, err := sched.Cache.IsAssumedPod(newPod)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -142,17 +142,12 @@ func (sched *Scheduler) updatePodInSchedulingQueue(oldObj, newObj interface{}) {`
`142`	`142`	`return`
`143`	`143`	`}`
`144`	`144`
`145`		`- isUnschedPodUpdateIncluded := false`
	`145`	`+ defer metrics.EventHandlingLatency.WithLabelValues(framework.UnscheduledPodUpdate.Label).Observe(metrics.SinceInSeconds(start))`
`146`	`146`	`for _, evt := range framework.PodSchedulingPropertiesChange(newPod, oldPod) {`
`147`		`- defer metrics.EventHandlingLatency.WithLabelValues(evt.Label).Observe(metrics.SinceInSeconds(start))`
`148`		`- if evt.Label == framework.UnscheduledPodUpdate.Label {`
`149`		`- isUnschedPodUpdateIncluded = true`
	`147`	`+ if evt.Label != framework.UnscheduledPodUpdate.Label {`
	`148`	`+ defer metrics.EventHandlingLatency.WithLabelValues(evt.Label).Observe(metrics.SinceInSeconds(start))`
`150`	`149`	`}`
`151`	`150`	`}`
`152`		`- if !isUnschedPodUpdateIncluded {`
`153`		`- // make sure we always record the latency with UnscheduledPodUpdate label.`
`154`		`- defer metrics.EventHandlingLatency.WithLabelValues(framework.UnscheduledPodUpdate.Label).Observe(metrics.SinceInSeconds(start))`
`155`		`- }`
`156`	`151`
`157`	`152`	`isAssumed, err := sched.Cache.IsAssumedPod(newPod)`
`158`	`153`	`if err != nil {`