Merge pull request #2764 from ncdc/fix-quota-gc-backlog

🐛 Prevent gc/quota workqueue backlogs

Author: openshift-merge-robot

pkg/reconciler/garbagecollector/garbagecollector_controller.go

@@ -290,10 +290,13 @@ func (c *Controller) startGarbageCollectorForLogicalCluster(ctx context.Context,
 		}
 	}()
 
-	// Make sure the GC monitors are synced at least once
-	garbageCollector.ResyncMonitors(ctx, c.dynamicDiscoverySharedInformerFactory)
+	// Do this in a goroutine to avoid holding up a worker in the event ResyncMonitors stalls for whatever reason
+	go func() {
+		// Make sure the GC monitors are synced at least once
+		garbageCollector.ResyncMonitors(ctx, c.dynamicDiscoverySharedInformerFactory)
 
-	go garbageCollector.Run(ctx, c.workersPerLogicalCluster)
+		go garbageCollector.Run(ctx, c.workersPerLogicalCluster)
+	}()
 
 	return nil
 }

pkg/reconciler/kubequota/kubequota_controller.go

@@ -309,10 +309,13 @@ func (c *Controller) startQuotaForLogicalCluster(ctx context.Context, clusterNam
 		}
 	}()
 
-	// Make sure the monitors are synced at least once
-	resourceQuotaController.UpdateMonitors(ctx, c.dynamicDiscoverySharedInformerFactory.ServerPreferredResources)
+	// Do this in a goroutine to avoid holding up a worker in the event UpdateMonitors stalls for whatever reason
+	go func() {
+		// Make sure the monitors are synced at least once
+		resourceQuotaController.UpdateMonitors(ctx, c.dynamicDiscoverySharedInformerFactory.ServerPreferredResources)
 
-	go resourceQuotaController.Run(ctx, c.workersPerLogicalCluster)
+		go resourceQuotaController.Run(ctx, c.workersPerLogicalCluster)
+	}()
 
 	return nil
 }