Merge pull request #651 from sivanzcw/develop

Reclaim Enhancement: Add Reclaimable parameter for queue

pkg/apis/scheduling/types.go

@@ -261,6 +261,8 @@ type QueueSpec struct {
 	Capability v1.ResourceList
 	// State controller the status of queue
 	State QueueState
+	// Reclaimable indicate whether the queue can be reclaimed by other queue
+	Reclaimable *bool
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

pkg/apis/scheduling/v1alpha2/types.go

@@ -262,6 +262,8 @@ type QueueSpec struct {
 	Capability v1.ResourceList `json:"capability,omitempty" protobuf:"bytes,2,opt,name=capability"`
 	// State controller the status of queue
 	State QueueState `json:"state,omitempty" protobuf:"bytes,3,opt,name=state"`
+	// Reclaimable indicate whether the queue can be reclaimed by other queue
+	Reclaimable *bool `json:"reclaimable,omitempty" protobuf:"bytes,4,opt,name=reclaimable"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

pkg/scheduler/actions/reclaim/reclaim.go

@@ -142,6 +142,10 @@ func (alloc *reclaimAction) Execute(ssn *framework.Session) {
 				if j, found := ssn.Jobs[task.Job]; !found {
 					continue
 				} else if j.Queue != job.Queue {
+					q := ssn.Queues[j.Queue]
+					if !q.Reclaimable() {
+						continue
+					}
 					// Clone task to avoid modify Task's status on node.
 					reclaimees = append(reclaimees, task.Clone())
 				}

pkg/scheduler/api/queue_info.go

@@ -56,3 +56,20 @@ func (q *QueueInfo) Clone() *QueueInfo {
 		Queue:  q.Queue,
 	}
 }
+
+// Reclaimable return whether queue is reclaimable
+func (q *QueueInfo) Reclaimable() bool {
+	if q == nil {
+		return false
+	}
+
+	if q.Queue == nil {
+		return false
+	}
+
+	if q.Queue.Spec.Reclaimable == nil {
+		return true
+	}
+
+	return *q.Queue.Spec.Reclaimable
+}