Merge pull request #3209 from Lily922/release-1.8-2

[cherry-pick for release-1.8]support preempting task with bound status
volcano-sh · Nov 22, 2023 · 8c5ab33 · 8c5ab33
2 parents 43e368b + f8d7324
commit 8c5ab33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pkg/scheduler/actions/preempt/preempt.go b/pkg/scheduler/actions/preempt/preempt.go
@@ -114,7 +114,7 @@ func (pmpt *Action) Execute(ssn *framework.Session) {
 
 				if preempted, _ := preempt(ssn, stmt, preemptor, func(task *api.TaskInfo) bool {
 					// Ignore non running task.
-					if task.Status != api.Running {
+					if !api.PreemptableStatus(task.Status) {
 						return false
 					}
 					// Ignore task with empty resource request.
@@ -169,7 +169,7 @@ func (pmpt *Action) Execute(ssn *framework.Session) {
 				stmt := framework.NewStatement(ssn)
 				assigned, _ := preempt(ssn, stmt, preemptor, func(task *api.TaskInfo) bool {
 					// Ignore non running task.
-					if task.Status != api.Running {
+					if !api.PreemptableStatus(task.Status) {
 						return false
 					}
 					// Ignore task with empty resource request.

diff --git a/pkg/scheduler/api/helpers.go b/pkg/scheduler/api/helpers.go
@@ -60,6 +60,16 @@ func getTaskStatus(pod *v1.Pod) TaskStatus {
 	return Unknown
 }
 
+// PreemptableStatus checks whether the task can be preempted
+func PreemptableStatus(status TaskStatus) bool {
+	switch status {
+	case Bound, Running:
+		return true
+	default:
+		return false
+	}
+}
+
 // AllocatedStatus checks whether the tasks has AllocatedStatus
 func AllocatedStatus(status TaskStatus) bool {
 	switch status {