Skip to content

Commit dbcf5e8

Browse files
committed
Register resourceaware plugin in factory.go; restore priority guard clause
1 parent 5d374c7 commit dbcf5e8

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

pkg/scheduler/plugins/factory.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ import (
4545
"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/subgrouporder"
4646
"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/taskorder"
4747
"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/topology"
48+
"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/resourceaware"
4849
)
4950

5051
func InitDefaultPlugins() {
5152
// Plugins for PodGroupInfos
5253
framework.RegisterPluginBuilder("predicates", predicates.New)
5354
framework.RegisterPluginBuilder("priority", priority.New)
55+
framework.RegisterPluginBuilder("resourceaware", resourceaware.New)
5456
framework.RegisterPluginBuilder("nodeplacement", nodeplacement.New)
5557
framework.RegisterPluginBuilder("nominatednode", nominatednode.New)
5658
framework.RegisterPluginBuilder("numa", numa.New)
@@ -79,4 +81,4 @@ func InitDefaultPlugins() {
7981

8082
// Always register the Job Order Plugin last.
8183
framework.RegisterPluginBuilder("reflectjoborder", reflectjoborder.New)
82-
}
84+
}

pkg/scheduler/plugins/resourceaware/resourceaware.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ func (rp *resourceAwarePlugin) JobOrderFn(l, r interface{}) int {
3131
lv := l.(*podgroup_info.PodGroupInfo)
3232
rv := r.(*podgroup_info.PodGroupInfo)
3333

34+
if lv.Priority != rv.Priority {
35+
return 0
36+
}
37+
3438
lGPU := lv.GetAliveTasksRequestedGPUs()
3539
rGPU := rv.GetAliveTasksRequestedGPUs()
3640

@@ -53,4 +57,4 @@ func (rp *resourceAwarePlugin) JobOrderFn(l, r interface{}) int {
5357
return 0
5458
}
5559

56-
func (rp *resourceAwarePlugin) OnSessionClose(_ *framework.Session) {}
60+
func (rp *resourceAwarePlugin) OnSessionClose(_ *framework.Session) {}

0 commit comments

Comments
 (0)