Merge pull request #733 from k82cn/add_res_pred_alloc

Added resources predicate in allocate action.
volcano-sh · Mar 9, 2020 · 2f6e785 · 2f6e785
2 parents b545729 + 7f97d53
commit 2f6e785
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pkg/scheduler/actions/allocate/allocate.go b/pkg/scheduler/actions/allocate/allocate.go
@@ -194,7 +194,14 @@ func (alloc *allocateAction) Execute(ssn *framework.Session) {
 				break
 			}
 
-			nodeScores := util.PrioritizeNodes(task, predicateNodes, ssn.BatchNodeOrderFn, ssn.NodeOrderMapFn, ssn.NodeOrderReduceFn)
+			var candidateNodes []*api.NodeInfo
+			for _, n := range predicateNodes {
+				if task.InitResreq.LessEqual(n.Idle) || task.InitResreq.LessEqual(n.FutureIdle()) {
+					candidateNodes = append(candidateNodes, n)
+				}
+			}
+
+			nodeScores := util.PrioritizeNodes(task, candidateNodes, ssn.BatchNodeOrderFn, ssn.NodeOrderMapFn, ssn.NodeOrderReduceFn)
 
 			node := util.SelectBestNode(nodeScores)
 			// Allocate idle resource to the task.