github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 08:09:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120125 from kerthcet/cleanup/write-to-cycle

Browse Source 
Make sure skipped score plugins always returned
This commit is contained in:
Kubernetes Prow Robot 2023-08-28 15:13:20 -07:00 committed by GitHub
commit 3e910875a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/scheduler/framework/runtime/framework.go
View File

@ -969,10 +969,11 @@ func (f *frameworkImpl) RunPreScorePlugins(
nodes []*v1.Node,
) (status *framework.Status) {
startTime := time.Now()
skipPlugins := sets.New[string]()
defer func() {
state.SkipScorePlugins = skipPlugins
metrics.FrameworkExtensionPointDuration.WithLabelValues(metrics.PreScore, status.Code().String(), f.profileName).Observe(metrics.SinceInSeconds(startTime))
}()
skipPlugins := sets.New[string]()
logger := klog.FromContext(ctx)
logger = klog.LoggerWithName(logger, "PreScore")
// TODO(knelasevero): Remove duplicated keys from log entry calls
@ -991,7 +992,6 @@ func (f *frameworkImpl) RunPreScorePlugins(
return framework.AsStatus(fmt.Errorf("running PreScore plugin %q: %w", pl.Name(), status.AsError()))
}
}
state.SkipScorePlugins = skipPlugins
return nil
}

3
pkg/scheduler/framework/runtime/framework_test.go
View File

@ -952,7 +952,8 @@ func TestRunPreScorePlugins(t *testing.T) {
inj: injectedResult{PreScoreStatus: int(framework.Error)},
},
},
wantStatusCode: framework.Error,
wantSkippedPlugins: sets.New("skip"),
wantStatusCode: framework.Error,
},
{
name: "all PreScore plugins returned skip",