refactor scheduler extender related API
- move extender related API from pkg/scheduler/api to pkg/scheduler/apis/extender/v1 - alias extenderv1 to pkg/scheduler/apis/extender/v1 - use NodeScore and NodeScoreList in non-extender logic
This commit is contained in:
@@ -403,7 +403,7 @@ func (f *framework) RunScorePlugins(pc *PluginContext, pod *v1.Pod, nodes []*v1.
|
||||
}
|
||||
pluginToNodeScores[pl.Name()][index] = NodeScore{
|
||||
Name: nodeName,
|
||||
Score: score,
|
||||
Score: int64(score),
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -439,12 +439,12 @@ func (f *framework) RunScorePlugins(pc *PluginContext, pod *v1.Pod, nodes []*v1.
|
||||
|
||||
for i, nodeScore := range nodeScoreList {
|
||||
// return error if score plugin returns invalid score.
|
||||
if nodeScore.Score > MaxNodeScore || nodeScore.Score < MinNodeScore {
|
||||
if nodeScore.Score > int64(MaxNodeScore) || nodeScore.Score < int64(MinNodeScore) {
|
||||
err := fmt.Errorf("score plugin %q returns an invalid score %v, it should in the range of [%v, %v] after normalizing", pl.Name(), nodeScore.Score, MinNodeScore, MaxNodeScore)
|
||||
errCh.SendErrorWithCancel(err, cancel)
|
||||
return
|
||||
}
|
||||
nodeScoreList[i].Score = nodeScore.Score * weight
|
||||
nodeScoreList[i].Score = nodeScore.Score * int64(weight)
|
||||
}
|
||||
})
|
||||
if err := errCh.ReceiveError(); err != nil {
|
||||
|
@@ -473,10 +473,10 @@ func buildConfigWithWeights(weights map[string]int32, ps ...string) *config.Plug
|
||||
}
|
||||
|
||||
type injectedResult struct {
|
||||
ScoreRes int `json:"scoreRes,omitempty"`
|
||||
NormalizeRes int `json:"normalizeRes,omitempty"`
|
||||
ScoreErr bool `json:"scoreErr,omitempty"`
|
||||
NormalizeErr bool `json:"normalizeErr,omitempty"`
|
||||
ScoreRes int `json:"scoreRes,omitempty"`
|
||||
NormalizeRes int64 `json:"normalizeRes,omitempty"`
|
||||
ScoreErr bool `json:"scoreErr,omitempty"`
|
||||
NormalizeErr bool `json:"normalizeErr,omitempty"`
|
||||
}
|
||||
|
||||
func setScoreRes(inj injectedResult) (int, *Status) {
|
||||
|
@@ -37,7 +37,7 @@ type NodeScoreList []NodeScore
|
||||
// NodeScore is a struct with node name and score.
|
||||
type NodeScore struct {
|
||||
Name string
|
||||
Score int
|
||||
Score int64
|
||||
}
|
||||
|
||||
// PluginToNodeScores declares a map from plugin name to its NodeScoreList.
|
||||
|
Reference in New Issue
Block a user