skip check ssn.Allocatable in reclaim action and add preemptiveFn in …

…proportion plugin Signed-off-by: bogo_y <[email protected]> Co-authored-by: Monokaix <[email protected]>
volcano-sh · Jan 6, 2025 · 61f9c9d · 61f9c9d
1 parent 29c8027
commit 61f9c9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/pkg/scheduler/actions/reclaim/reclaim.go b/pkg/scheduler/actions/reclaim/reclaim.go
@@ -123,11 +123,8 @@ func (ra *Action) Execute(ssn *framework.Session) {
 			continue
 		}
 
-		if !ssn.Allocatable(queue, task) {
-			klog.V(3).Infof("Queue <%s> is overused when considering task <%s>, ignore it.", queue.Name, task.Name)
-			continue
-		}
-
+		//In allocate action we need check all the ancestor queues' capability but in reclaim action we should just check current queue's capability, and reclaim happens when queue not allocatable so we just need focus on the reclaim here.
+		//So it's more descriptive to user preempt related semantics.
 		if !ssn.Preemptive(queue, task) {
 			klog.V(3).Infof("Queue <%s> can not reclaim by preempt others when considering task <%s> , ignore it.", queue.Name, task.Name)
 			continue

diff --git a/pkg/scheduler/plugins/proportion/proportion.go b/pkg/scheduler/plugins/proportion/proportion.go
@@ -303,7 +303,7 @@ func (pp *proportionPlugin) OnSessionOpen(ssn *framework.Session) {
 		return overused
 	})
 
-	ssn.AddAllocatableFn(pp.Name(), func(queue *api.QueueInfo, candidate *api.TaskInfo) bool {
+	queueAllocatable := func(queue *api.QueueInfo, candidate *api.TaskInfo) bool {
 		attr := pp.queueOpts[queue.UID]
 
 		futureUsed := attr.allocated.Clone().Add(candidate.Resreq)
@@ -314,6 +314,15 @@ func (pp *proportionPlugin) OnSessionOpen(ssn *framework.Session) {
 		}
 
 		return allocatable
+	}
+
+	ssn.AddAllocatableFn(pp.Name(), func(queue *api.QueueInfo, candidate *api.TaskInfo) bool {
+		return queueAllocatable(queue, candidate)
+	})
+	ssn.AddPreemptiveFn(pp.Name(), func(obj interface{}, candidate interface{}) bool {
+		queue := obj.(*api.QueueInfo)
+		task := candidate.(*api.TaskInfo)
+		return queueAllocatable(queue, task)
 	})
 
 	ssn.AddJobEnqueueableFn(pp.Name(), func(obj interface{}) int {