Merge pull request #631 from zionwu/fix-reclaim-issue

Push job back to queue if task is assigned in reclaim action
volcano-sh · Dec 23, 2019 · d644d44 · d644d44
2 parents cf5d99a + 01a6fc6
commit d644d44
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/scheduler/actions/reclaim/reclaim.go b/pkg/scheduler/actions/reclaim/reclaim.go
@@ -105,7 +105,8 @@ func (alloc *reclaimAction) Execute(ssn *framework.Session) {
 		}
 
 		// Found "high" priority job
-		if jobs, found := preemptorsMap[queue.UID]; !found || jobs.Empty() {
+		jobs, found := preemptorsMap[queue.UID]
+		if !found || jobs.Empty() {
 			continue
 		} else {
 			job = jobs.Pop().(*api.JobInfo)
@@ -195,8 +196,9 @@ func (alloc *reclaimAction) Execute(ssn *framework.Session) {
 		}
 
 		if assigned {
-			queues.Push(queue)
+			jobs.Push(job)
 		}
+		queues.Push(queue)
 	}
 
 }