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

Merge pull request #80305 from hex108/cleanup_score_plugin

Browse Source 
Precheck score plugins' weight when initializing
This commit is contained in:
Kubernetes Prow Robot 2019-07-24 15:20:05 -07:00 committed by GitHub
commit acd597dbac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,9 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
if !ok { if !ok {
return nil, fmt.Errorf("plugin %v does not extend score plugin", sc.Name) return nil, fmt.Errorf("plugin %v does not extend score plugin", sc.Name)
} }
if f.pluginNameToWeightMap[p.Name()] == 0 {
return nil, fmt.Errorf("score plugin %v is not configured with weight", p.Name())
}
f.scorePlugins = append(f.scorePlugins, p) f.scorePlugins = append(f.scorePlugins, p)
} else { } else {
return nil, fmt.Errorf("score plugin %v does not exist", sc.Name) return nil, fmt.Errorf("score plugin %v does not exist", sc.Name)
@ -314,12 +317,8 @@ func (f *framework) RunScorePlugins(pc *PluginContext, pod *v1.Pod, nodes []*v1.
errCh := schedutil.NewErrorChannel() errCh := schedutil.NewErrorChannel()
workqueue.ParallelizeUntil(ctx, 16, len(nodes), func(index int) { workqueue.ParallelizeUntil(ctx, 16, len(nodes), func(index int) {
for _, pl := range f.scorePlugins { for _, pl := range f.scorePlugins {
weight, weightExists := f.pluginNameToWeightMap[pl.Name()] // Score plugins' weight has been checked when they are initialized.
if !weightExists { weight := f.pluginNameToWeightMap[pl.Name()]
err := fmt.Errorf("weight does not exist for plugin %v", pl.Name())
errCh.SendErrorWithCancel(err, cancel)
return
}
score, status := pl.Score(pc, pod, nodes[index].Name) score, status := pl.Score(pc, pod, nodes[index].Name)
if !status.IsSuccess() { if !status.IsSuccess() {
errCh.SendErrorWithCancel(fmt.Errorf(status.Message()), cancel) errCh.SendErrorWithCancel(fmt.Errorf(status.Message()), cancel)