backfill add score process

Signed-off-by: lowang-bh <[email protected]>
volcano-sh · Jul 8, 2023 · 1eb8850 · 1eb8850
1 parent 9427174
commit 1eb8850
Showing 1 changed file with 27 additions and 21 deletions.
diff --git a/pkg/scheduler/actions/backfill/backfill.go b/pkg/scheduler/actions/backfill/backfill.go
@@ -24,6 +24,7 @@ import (
 	"volcano.sh/volcano/pkg/scheduler/api"
 	"volcano.sh/volcano/pkg/scheduler/framework"
 	"volcano.sh/volcano/pkg/scheduler/metrics"
+	"volcano.sh/volcano/pkg/scheduler/util"
 )
 
 type Action struct{}
@@ -53,6 +54,8 @@ func (backfill *Action) Execute(ssn *framework.Session) {
 			continue
 		}
 
+		ph := util.NewPredicateHelper()
+
 		for _, task := range job.TaskStatusIndex[api.Pending] {
 			if task.InitResreq.IsEmpty() {
 				allocated := false
@@ -67,30 +70,33 @@ func (backfill *Action) Execute(ssn *framework.Session) {
 					break
 				}
 
-				// As task did not request resources, so it only need to meet predicates.
-				// TODO (k82cn): need to prioritize nodes to avoid pod hole.
-				for _, node := range ssn.Nodes {
-					// TODO (k82cn): predicates did not consider pod number for now, there'll
-					// be ping-pong case here.
-					if err := ssn.PredicateFn(task, node); err != nil {
-						klog.V(3).Infof("Predicates failed for task <%s/%s> on node <%s>: %v",
-							task.Namespace, task.Name, node.Name, err)
-						fe.SetNodeError(node.Name, err)
-						continue
-					}
+				predicateNodes, fitErrors := ph.PredicateNodes(task, ssn.NodeList, ssn.PredicateFn, true)
+				if len(predicateNodes) == 0 {
+					klog.V(3).Infof("Predicates failed for task <%s/%s>", task.Namespace, task.Name)
+					job.NodesFitErrors[task.UID] = fitErrors
+					break
+				}
 
-					klog.V(3).Infof("Binding Task <%v/%v> to node <%v>", task.Namespace, task.Name, node.Name)
-					if err := ssn.Allocate(task, node); err != nil {
-						klog.Errorf("Failed to bind Task %v on %v in Session %v", task.UID, node.Name, ssn.UID)
-						fe.SetNodeError(node.Name, err)
-						continue
+				node := predicateNodes[0]
+				if len(predicateNodes) > 1 {
+					nodeScores := util.PrioritizeNodes(task, predicateNodes, ssn.BatchNodeOrderFn, ssn.NodeOrderMapFn, ssn.NodeOrderReduceFn)
+					node = ssn.BestNodeFn(task, nodeScores)
+					if node == nil {
+						node = util.SelectBestNode(nodeScores)
 					}
-
-					metrics.UpdateE2eSchedulingDurationByJob(job.Name, string(job.Queue), job.Namespace, metrics.Duration(job.CreationTimestamp.Time))
-					metrics.UpdateE2eSchedulingLastTimeByJob(job.Name, string(job.Queue), job.Namespace, time.Now())
-					allocated = true
-					break
 				}
+				// As task did not request resources, so it only need to meet predicates.
+				// Done (k82cn): need to prioritize nodes to avoid pod hole.
+				klog.V(3).Infof("Binding Task <%v/%v> to node <%v>", task.Namespace, task.Name, node.Name)
+				if err := ssn.Allocate(task, node); err != nil {
+					klog.Errorf("Failed to bind Task %v on %v in Session %v", task.UID, node.Name, ssn.UID)
+					fe.SetNodeError(node.Name, err)
+					continue
+				}
+
+				metrics.UpdateE2eSchedulingDurationByJob(job.Name, string(job.Queue), job.Namespace, metrics.Duration(job.CreationTimestamp.Time))
+				metrics.UpdateE2eSchedulingLastTimeByJob(job.Name, string(job.Queue), job.Namespace, time.Now())
+				allocated = true
 
 				if !allocated {
 					job.NodesFitErrors[task.UID] = fe