scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-03 23:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return all predicate failures instead of the first one

Browse Source
This commit is contained in:
Wei Huang
2019-12-06 15:48:05 -08:00
parent 2fbe432d23
commit a136108d2b
8 changed files with 291 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/scheduler/framework/plugins/migration/utils.go
View File

@@ -41,12 +41,17 @@ func PredicateResultToFrameworkStatus(reasons []predicates.PredicateFailureReaso
return nil
}
if r := predicates.UnresolvablePredicateExists(reasons); r != nil {
return framework.NewStatus(framework.UnschedulableAndUnresolvable, r.GetReason())
code := framework.Unschedulable
if predicates.UnresolvablePredicateExists(reasons) {
code = framework.UnschedulableAndUnresolvable
}
// We will just use the first reason.
return framework.NewStatus(framework.Unschedulable, reasons[0].GetReason())
// We will keep all failure reasons.
var failureReasons []string
for _, reason := range reasons {
failureReasons = append(failureReasons, reason.GetReason())
}
return framework.NewStatus(code, failureReasons...)
}
// ErrorToFrameworkStatus converts an error to a framework status.

2
pkg/scheduler/framework/plugins/migration/utils_test.go
View File

@@ -54,7 +54,7 @@ func TestPredicateResultToFrameworkStatus(t *testing.T) {
{
name: "Unschedulable and Unresolvable",
reasons: []predicates.PredicateFailureReason{predicates.ErrDiskConflict, predicates.ErrNodeSelectorNotMatch},
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, "node(s) didn't match node selector"),
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, "node(s) had no available disk", "node(s) didn't match node selector"),
},
}
for _, tt := range tests {