refactor(scheduler): rename resourceaware plugin to gpujoborder for clarity

Author: CoolingCube

pkg/scheduler/plugins/factory.go

@@ -45,14 +45,14 @@ import (
 	"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/subgrouporder"
 	"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/taskorder"
 	"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/topology"
-        "github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/resourceaware"
+        "github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/plugins/gpujoborder"
 )
 
 func InitDefaultPlugins() {
 	// Plugins for PodGroupInfos
 	framework.RegisterPluginBuilder("predicates", predicates.New)
 	framework.RegisterPluginBuilder("priority", priority.New)
-	framework.RegisterPluginBuilder("resourceaware", resourceaware.New)
+	framework.RegisterPluginBuilder("gpujoborder", gpujoborder.New)
 	framework.RegisterPluginBuilder("nodeplacement", nodeplacement.New)
 	framework.RegisterPluginBuilder("nominatednode", nominatednode.New)
 	framework.RegisterPluginBuilder("numa", numa.New)

pkg/scheduler/plugins/gpujoborder/gpujoborder.go

@@ -0,0 +1,65 @@
+package gpujoborder
+
+import (
+	"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/api/podgroup_info"
+	"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/framework"
+	"github.com/kai-scheduler/KAI-scheduler/pkg/scheduler/log"
+)
+
+const (
+	ModePreferLarger  = "prefer-larger"
+	ModePreferSmaller = "prefer-smaller"
+)
+
+type gpuJobOrderPlugin struct {
+	mode string
+}
+
+func New(arguments framework.PluginArguments) framework.Plugin {
+	mode := arguments.GetString("mode", ModePreferLarger)
+	if mode != ModePreferLarger && mode != ModePreferSmaller {
+		log.InfraLogger.Warningf("gpujoborder: unrecognized mode %q, defaulting to prefer-larger", mode)
+		mode = ModePreferLarger
+	}
+	return &gpuJobOrderPlugin{mode: mode}
+}
+
+func (rp *gpuJobOrderPlugin) Name() string {
+	return "gpujoborder"
+}
+
+func (rp *gpuJobOrderPlugin) OnSessionOpen(ssn *framework.Session) {
+	ssn.AddJobOrderFn(rp.JobOrderFn)
+}
+
+func (rp *gpuJobOrderPlugin) JobOrderFn(l, r interface{}) int {
+	lv := l.(*podgroup_info.PodGroupInfo)
+	rv := r.(*podgroup_info.PodGroupInfo)
+
+	if lv.Priority != rv.Priority {
+		return 0
+	}
+
+	lGPU := lv.GetAliveTasksRequestedGPUs()
+	rGPU := rv.GetAliveTasksRequestedGPUs()
+
+	switch rp.mode {
+	case ModePreferSmaller:
+		if lGPU < rGPU {
+			return -1
+		}
+		if lGPU > rGPU {
+			return 1
+		}
+	default: // ModePreferLarger
+		if lGPU > rGPU {
+			return -1
+		}
+		if lGPU < rGPU {
+			return 1
+		}
+	}
+	return 0
+}
+
+func (rp *gpuJobOrderPlugin) OnSessionClose(_ *framework.Session) {}

…gins/resourceaware/resourceaware_test.go …/plugins/gpujoborder/gpujoborder_test.gopkg/scheduler/plugins/resourceaware/resourceaware_test.go renamed to pkg/scheduler/plugins/gpujoborder/gpujoborder_test.go pkg/scheduler/plugins/resourceaware/resourceaware_test.go renamed to pkg/scheduler/plugins/gpujoborder/gpujoborder_test.go

@@ -1,4 +1,4 @@
-package resourceaware
+package gpujoborder
 
 import (
 	"testing"
@@ -22,15 +22,15 @@ func makeGPUPodGroup(uid string, priority int32, gpuCount float64, vm *resource_
 	return pg
 }
 
-func newPlugin(t *testing.T, mode string) *resourceAwarePlugin {
+func newPlugin(t *testing.T, mode string) *gpuJobOrderPlugin {
 	t.Helper()
 	args := framework.PluginArguments{}
 	if mode != "" {
 		args["mode"] = mode
 	}
-	rp, ok := New(args).(*resourceAwarePlugin)
+	rp, ok := New(args).(*gpuJobOrderPlugin)
 	if !ok {
-		t.Fatalf("New() did not return *resourceAwarePlugin")
+		t.Fatalf("New() did not return *gpuJobOrderPlugin")
 	}
 	return rp
 }