github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90467 from Huang-Wei/honor-runAllFilters

Browse Source 
Simplify status handling of scheduler RunFilterPlugins
This commit is contained in:
Kubernetes Prow Robot 2020-04-27 22:26:43 -07:00 committed by GitHub
commit fabe9cddf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/scheduler/framework/v1alpha1/framework.go
View File

@ -424,19 +424,15 @@ func (f *framework) RunFilterPlugins(
pod *v1.Pod, pod *v1.Pod,
nodeInfo *NodeInfo, nodeInfo *NodeInfo,
) PluginToStatus { ) PluginToStatus {
var firstFailedStatus *Status
statuses := make(PluginToStatus) statuses := make(PluginToStatus)
for _, pl := range f.filterPlugins { for _, pl := range f.filterPlugins {
pluginStatus := f.runFilterPlugin(ctx, pl, state, pod, nodeInfo) pluginStatus := f.runFilterPlugin(ctx, pl, state, pod, nodeInfo)
if len(statuses) == 0 {
firstFailedStatus = pluginStatus
}
if !pluginStatus.IsSuccess() { if !pluginStatus.IsSuccess() {
if !pluginStatus.IsUnschedulable() { if !pluginStatus.IsUnschedulable() {
// Filter plugins are not supposed to return any status other than // Filter plugins are not supposed to return any status other than
// Success or Unschedulable. // Success or Unschedulable.
firstFailedStatus = NewStatus(Error, fmt.Sprintf("running %q filter plugin for pod %q: %v", pl.Name(), pod.Name, pluginStatus.Message())) errStatus := NewStatus(Error, fmt.Sprintf("running %q filter plugin for pod %q: %v", pl.Name(), pod.Name, pluginStatus.Message()))
return map[string]*Status{pl.Name(): firstFailedStatus} return map[string]*Status{pl.Name(): errStatus}
} }
statuses[pl.Name()] = pluginStatus statuses[pl.Name()] = pluginStatus
if !f.runAllFilters { if !f.runAllFilters {