Added admission checking on nominate

kubernetes-sigs · Apr 4, 2023 · 0bb02b0 · 0bb02b0
1 parent f4bc8e1
commit 0bb02b0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -703,13 +703,20 @@ func (c *Cache) DeleteWorkload(w *kueue.Workload) error {
 	return nil
 }
 
-func (c *Cache) IsAssumedWorkload(w *kueue.Workload) bool {
+func (c *Cache) IsAssumedOrAdmittedWorkload(w workload.Info) bool {
 	c.Lock()
 	defer c.Unlock()
 
-	k := workload.Key(w)
-	_, assumed := c.assumedWorkloads[k]
-	return assumed
+	k := workload.Key(w.Obj)
+	if _, assumed := c.assumedWorkloads[k]; assumed {
+		return true
+	}
+	if cq, exists := c.clusterQueues[w.ClusterQueue]; exists {
+		if _, admitted := cq.Workloads[k]; admitted {
+			return true
+		}
+	}
+	return false
 }
 
 func (c *Cache) AssumeWorkload(w *kueue.Workload) error {

diff --git a/pkg/controller/core/clusterqueue_controller.go b/pkg/controller/core/clusterqueue_controller.go
@@ -140,6 +140,10 @@ func (r *ClusterQueueReconciler) Reconcile(ctx context.Context, req ctrl.Request
 func (r *ClusterQueueReconciler) NotifyWorkloadUpdate(oldWl, newWl *kueue.Workload) {
 	if oldWl != nil {
 		r.wlUpdateCh <- event.GenericEvent{Object: oldWl}
+		if newWl != nil && oldWl.Spec.QueueName != newWl.Spec.QueueName {
+			r.wlUpdateCh <- event.GenericEvent{Object: newWl}
+			return
+		}
 	}
 	if newWl != nil {
 		r.wlUpdateCh <- event.GenericEvent{Object: newWl}

diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -240,7 +240,7 @@ func (s *Scheduler) nominate(ctx context.Context, workloads []workload.Info, sna
 		cq := snap.ClusterQueues[w.ClusterQueue]
 		ns := corev1.Namespace{}
 		e := entry{Info: w}
-		if s.cache.IsAssumedWorkload(w.Obj) {
+		if s.cache.IsAssumedOrAdmittedWorkload(w) {
 			log.Error(fmt.Errorf("workload is assumed"), "nominate", "workloadInfo", w)
 			continue
 		} else if snap.InactiveClusterQueueSets.Has(w.ClusterQueue) {