Round 3

kubernetes-sigs · Aug 12, 2022 · 6e9e92a · 6e9e92a
1 parent 47b2e8c
commit 6e9e92a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/queue/cluster_queue_impl.go b/pkg/queue/cluster_queue_impl.go
@@ -116,8 +116,8 @@ func (c *ClusterQueueImpl) DeleteFromQueue(q *Queue) {
 }
 
 func (c *ClusterQueueImpl) RequeueIfNotPresent(wInfo *workload.Info, reason RequeueReason) bool {
-	// By default, the only reason we don't requeue is if the workload doesn't match the CQ's
-	// namespace selector.
+	// By default, the only reason we don't requeue immediately is if the workload doesn't
+	// match the CQ's namespace selector.
 	return c.requeueIfNotPresent(wInfo, reason != RequeueReasonNamespaceMismatch)
 }
 

diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -524,7 +524,7 @@ func (e entryOrdering) Less(i, j int) bool {
 }
 
 func (s *Scheduler) requeueAndUpdate(log logr.Logger, ctx context.Context, e entry) {
-	if e.status != "" && e.requeueReason == queue.RequeueReasonGeneric {
+	if e.status != notNominated && e.requeueReason == queue.RequeueReasonGeneric {
 		// Failed after nomination is the only reason why a workload would be requeued downstream.
 		e.requeueReason = queue.RequeueReasonFailedAfterNomination
 	}