Merge pull request #108842 from zzr93/master

clean an unnecessary else
This commit is contained in:
Kubernetes Prow Robot 2022-03-21 07:39:21 -07:00 committed by GitHub
commit 637394c539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -720,7 +720,8 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) {
sched.SchedulingQueue.MoveAllToActiveOrBackoffQueue(internalqueue.AssignedPodDelete, nil) sched.SchedulingQueue.MoveAllToActiveOrBackoffQueue(internalqueue.AssignedPodDelete, nil)
} }
sched.handleSchedulingFailure(fwk, assumedPodInfo, fmt.Errorf("binding rejected: %w", err), SchedulerError, clearNominatedNode) sched.handleSchedulingFailure(fwk, assumedPodInfo, fmt.Errorf("binding rejected: %w", err), SchedulerError, clearNominatedNode)
} else { return
}
// Calculating nodeResourceString can be heavy. Avoid it if klog verbosity is below 2. // Calculating nodeResourceString can be heavy. Avoid it if klog verbosity is below 2.
klog.V(2).InfoS("Successfully bound pod to node", "pod", klog.KObj(pod), "node", scheduleResult.SuggestedHost, "evaluatedNodes", scheduleResult.EvaluatedNodes, "feasibleNodes", scheduleResult.FeasibleNodes) klog.V(2).InfoS("Successfully bound pod to node", "pod", klog.KObj(pod), "node", scheduleResult.SuggestedHost, "evaluatedNodes", scheduleResult.EvaluatedNodes, "feasibleNodes", scheduleResult.FeasibleNodes)
metrics.PodScheduled(fwk.ProfileName(), metrics.SinceInSeconds(start)) metrics.PodScheduled(fwk.ProfileName(), metrics.SinceInSeconds(start))
@ -736,7 +737,6 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) {
// Unlike the logic in scheduling cycle, we don't bother deleting the entries // Unlike the logic in scheduling cycle, we don't bother deleting the entries
// as `podsToActivate.Map` is no longer consumed. // as `podsToActivate.Map` is no longer consumed.
} }
}
}() }()
} }