Skip to content

Commit fabe9cd

Browse files
authored
Merge pull request kubernetes#90467 from Huang-Wei/honor-runAllFilters
Simplify status handling of scheduler RunFilterPlugins
2 parents 62880cb + 92ba2a4 commit fabe9cd

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

pkg/scheduler/framework/v1alpha1/framework.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -424,19 +424,15 @@ func (f *framework) RunFilterPlugins(
424424
pod *v1.Pod,
425425
nodeInfo *NodeInfo,
426426
) PluginToStatus {
427-
var firstFailedStatus *Status
428427
statuses := make(PluginToStatus)
429428
for _, pl := range f.filterPlugins {
430429
pluginStatus := f.runFilterPlugin(ctx, pl, state, pod, nodeInfo)
431-
if len(statuses) == 0 {
432-
firstFailedStatus = pluginStatus
433-
}
434430
if !pluginStatus.IsSuccess() {
435431
if !pluginStatus.IsUnschedulable() {
436432
// Filter plugins are not supposed to return any status other than
437433
// Success or Unschedulable.
438-
firstFailedStatus = NewStatus(Error, fmt.Sprintf("running %q filter plugin for pod %q: %v", pl.Name(), pod.Name, pluginStatus.Message()))
439-
return map[string]*Status{pl.Name(): firstFailedStatus}
434+
errStatus := NewStatus(Error, fmt.Sprintf("running %q filter plugin for pod %q: %v", pl.Name(), pod.Name, pluginStatus.Message()))
435+
return map[string]*Status{pl.Name(): errStatus}
440436
}
441437
statuses[pl.Name()] = pluginStatus
442438
if !f.runAllFilters {

0 commit comments

Comments
 (0)