[draft] refactor retry to close watchFactory

leverage stop channel on watch factory when periodic retry
stopchannel is called

Signed-off-by: Ben Pickard <bpickard@redhat.com>

go-controller/pkg/factory/factory.go

@@ -341,6 +341,11 @@ func NewNodeWatchFactory(ovnClientset *util.OVNClientset, nodeName string) (*Wat
 	return wf, nil
 }
 
+func (wf *WatchFactory) WaitForWatchFactoryStopChannel(stopChan chan struct{}) {
+	<-wf.stopChan
+	close(stopChan)
+}
+
 func (wf *WatchFactory) Shutdown() {
 	close(wf.stopChan)
 

go-controller/pkg/ovn/obj_retry.go

@@ -1108,6 +1108,10 @@ func (oc *Controller) iterateRetryResources(r *RetryObjs) {
 // retryObjInterval seconds or when requested through retryChan.
 func (oc *Controller) periodicallyRetryResources(r *RetryObjs) {
 	timer := time.NewTicker(retryObjInterval)
+	waitCh := make(chan struct{})
+	go func() {
+		oc.watchFactory.WaitForWatchFactoryStopChannel(waitCh)
+	}()
 	defer timer.Stop()
 	for {
 		select {
@@ -1119,7 +1123,7 @@ func (oc *Controller) periodicallyRetryResources(r *RetryObjs) {
 			oc.iterateRetryResources(r)
 			timer.Reset(retryObjInterval)
 
-		case <-oc.stopChan:
+		case <-waitCh:
 			klog.V(5).Infof("Stop channel got triggered: will stop retrying failed objects of type %s", r.oType)
 			return
 		}