remove stale copy from event queue

asm582 · asm582 · commit 3e86cab240d6 · 2023-08-09T22:42:11.000-04:00
diff --git a/pkg/controller/queuejob/queuejob_controller_ex.go b/pkg/controller/queuejob/queuejob_controller_ex.go
@@ -1069,6 +1069,8 @@ func (qjm *XController) ScheduleNext() {
 					}
 					return retryErr
 				}
+				//Remove stale copy
+				qjm.eventQueue.Delete(qj)
 				if err00 := qjm.eventQueue.Add(qj); err00 != nil { // unsuccessful add to eventQueue, add back to activeQ
 					klog.Errorf("[ScheduleNext] [Dispatcher Mode] Fail to add %s to eventQueue, activeQ.Add_toSchedulingQueue &qj=%p Version=%s Status=%+v err=%#v", qj.Name, qj, qj.ResourceVersion, qj.Status, err)
 					qjm.qjqueue.MoveToActiveQueueIfExists(qj)
@@ -1225,6 +1227,8 @@ func (qjm *XController) ScheduleNext() {
 						}
 						tempAW.DeepCopyInto(qj)
 						// add to eventQueue for dispatching to Etcd
+						// Remove stale copy
+						qjm.eventQueue.Delete(qj)
 						if err00 := qjm.eventQueue.Add(qj); err00 != nil { // unsuccessful add to eventQueue, add back to activeQ
 							klog.Errorf("[ScheduleNext] [Agent Mode]  Failed to add '%s/%s' to eventQueue, activeQ.Add_toSchedulingQueue &qj=%p Version=%s Status=%+v err=%#v", qj.Namespace,
 								qj.Name, qj, qj.ResourceVersion, qj.Status, err)

Original file line number	Diff line number	Diff line change
`@@ -1069,6 +1069,8 @@ func (qjm *XController) ScheduleNext() {`
`1069`	`1069`	`}`
`1070`	`1070`	`return retryErr`
`1071`	`1071`	`}`
	`1072`	`+ //Remove stale copy`
	`1073`	`+ qjm.eventQueue.Delete(qj)`
`1072`	`1074`	`if err00 := qjm.eventQueue.Add(qj); err00 != nil { // unsuccessful add to eventQueue, add back to activeQ`
`1073`	`1075`	`klog.Errorf("[ScheduleNext] [Dispatcher Mode] Fail to add %s to eventQueue, activeQ.Add_toSchedulingQueue &qj=%p Version=%s Status=%+v err=%#v", qj.Name, qj, qj.ResourceVersion, qj.Status, err)`
`1074`	`1076`	`qjm.qjqueue.MoveToActiveQueueIfExists(qj)`
`@@ -1225,6 +1227,8 @@ func (qjm *XController) ScheduleNext() {`
`1225`	`1227`	`}`
`1226`	`1228`	`tempAW.DeepCopyInto(qj)`
`1227`	`1229`	`// add to eventQueue for dispatching to Etcd`
	`1230`	`+ // Remove stale copy`
	`1231`	`+ qjm.eventQueue.Delete(qj)`
`1228`	`1232`	`if err00 := qjm.eventQueue.Add(qj); err00 != nil { // unsuccessful add to eventQueue, add back to activeQ`
`1229`	`1233`	`klog.Errorf("[ScheduleNext] [Agent Mode] Failed to add '%s/%s' to eventQueue, activeQ.Add_toSchedulingQueue &qj=%p Version=%s Status=%+v err=%#v", qj.Namespace,`
`1230`	`1234`	`qj.Name, qj, qj.ResourceVersion, qj.Status, err)`