Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NodeOrder to devices API #2959

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/scheduler/api/devices/nvidia/gpushare/device_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ func (gs *GPUDevices) FilterNode(pod *v1.Pod) (int, string, error) {
return devices.Success, "", nil
}

func (gs *GPUDevices) ScoreNode(pod *v1.Pod) (float64, error) {
return 0, nil
}

func (gs *GPUDevices) GetStatus() string {
return ""
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/scheduler/api/devices/nvidia/vgpu/device_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ func (gs *GPUDevices) FilterNode(pod *v1.Pod) (int, string, error) {
return devices.Success, "", nil
}

func (gs *GPUDevices) ScoreNode(pod *v1.Pod) (float64, error) {
return 0, nil
}

func (gs *GPUDevices) GetStatus() string {
return ""
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/scheduler/api/shared_device_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ type Devices interface {
// that the pod can get scheduled with preemption.
// The accompanying status message should explain why the pod is unschedulable.
FilterNode(pod *v1.Pod) (int, string, error)
//ScoreNode returns the score of the current node based on this device
ScoreNode(pod *v1.Pod) (float64, error)
//Allocate action in predicate
Allocate(kubeClient kubernetes.Interface, pod *v1.Pod) error
//Release action in predicate
Expand Down
99 changes: 99 additions & 0 deletions pkg/scheduler/plugins/devicescore/devicescore.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
Copyright 2023 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package devicescore

import (
"k8s.io/klog/v2"

"volcano.sh/volcano/pkg/scheduler/api"
"volcano.sh/volcano/pkg/scheduler/framework"
)

// PluginName indicates name of volcano scheduler plugin.
const PluginName = "devicescore"

type priorityPlugin struct {
// Arguments given for the plugin
pluginArguments framework.Arguments
}
type deviceWeight map[string]float64

// New return priority plugin
func New(arguments framework.Arguments) framework.Plugin {
return &priorityPlugin{pluginArguments: arguments}
}

func (pp *priorityPlugin) Name() string {
return PluginName
}

func enableDeviceScore(args framework.Arguments) deviceWeight {
/*
actions: "reclaim, allocate, backfill, preempt"
tiers:
- plugins:
- name: priority
- name: gang
- name: conformance
- plugins:
- name: drf
- name: predicates
predicate.vGPUEnable: true
predicate.GPUSharingEnable: true
- name: devicescore
arguments:
GpuShare: 1.2
vgpu4pd: 3
- name: proportion
- name: nodeorder
*/

scoreMap := make(deviceWeight)
for _, val := range api.RegisteredDevices {
weight := float64(0)
args.GetFloat64(&weight, val)
scoreMap[val] = weight
}
return scoreMap
}

func (pp *priorityPlugin) OnSessionOpen(ssn *framework.Session) {
ssn.AddBatchNodeOrderFn(pp.Name(), func(task *api.TaskInfo, nodes []*api.NodeInfo) (map[string]float64, error) {
score := map[string]float64{}
scoreMap := enableDeviceScore(pp.pluginArguments)
for _, node := range nodes {
for _, val := range api.RegisteredDevices {
if devices, ok := node.Others[val].(api.Devices); ok {
if !devices.HasDeviceRequest(task.Pod) {
continue
}
devScore, err := devices.ScoreNode(task.Pod)
if err != nil {
klog.Warningln("scoreNode failed in predicate nodeorderFn", err.Error())
return score, err
}
score[node.Name] += scoreMap[val] * devScore
} else {
klog.Warningf("Devices %s assertion conversion failed, skip", val)
}
}
}
return score, nil
})
}

func (pp *priorityPlugin) OnSessionClose(ssn *framework.Session) {}
2 changes: 2 additions & 0 deletions pkg/scheduler/plugins/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"volcano.sh/volcano/pkg/scheduler/plugins/binpack"
"volcano.sh/volcano/pkg/scheduler/plugins/cdp"
"volcano.sh/volcano/pkg/scheduler/plugins/conformance"
"volcano.sh/volcano/pkg/scheduler/plugins/devicescore"
"volcano.sh/volcano/pkg/scheduler/plugins/drf"
"volcano.sh/volcano/pkg/scheduler/plugins/extender"
"volcano.sh/volcano/pkg/scheduler/plugins/gang"
Expand All @@ -47,6 +48,7 @@ func init() {
framework.RegisterPluginBuilder(nodeorder.PluginName, nodeorder.New)
framework.RegisterPluginBuilder(conformance.PluginName, conformance.New)
framework.RegisterPluginBuilder(binpack.PluginName, binpack.New)
framework.RegisterPluginBuilder(devicescore.PluginName, devicescore.New)
framework.RegisterPluginBuilder(tdm.PluginName, tdm.New)
framework.RegisterPluginBuilder(overcommit.PluginName, overcommit.New)
framework.RegisterPluginBuilder(sla.PluginName, sla.New)
Expand Down
Loading