Merge pull request #4 from dramich/queue24

[backport] Drop things from the queue when completed
rancher · Apr 16, 2020 · 0a5d0fb · 0a5d0fb
2 parents 61a9051 + a7b2fc9
commit 0a5d0fb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/clustercache/controller.go b/pkg/clustercache/controller.go
@@ -216,6 +216,7 @@ func (h *clusterCache) List(gvr schema2.GroupVersionResource) []interface{} {
 }
 
 func (h *clusterCache) start() {
+	defer h.workqueue.ShutDown()
 	for {
 		eventObj, ok := h.workqueue.Get()
 		if ok {
@@ -227,6 +228,7 @@ func (h *clusterCache) start() {
 		w := h.watchers[event.gvr]
 		h.RUnlock()
 		if w == nil {
+			h.workqueue.Done(eventObj)
 			continue
 		}
 
@@ -247,6 +249,7 @@ func (h *clusterCache) start() {
 				logrus.Errorf("failed to handle remove event: %v", err)
 			}
 		}
+		h.workqueue.Done(eventObj)
 	}
 }