Merge pull request #372 from digitalocean/do-not-forget-work-item-on-firewall-controller-error

Timo Reimann · web-flow · commit e1edf0bbb3d6 · 2021-02-17T18:47:43.000+01:00
Do not forget work item on firewall controller error
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # CHANGELOG
 
+* Do not forget work item on firewall controller error (@timoreimann)
+
 ## v0.1.31 (beta) - January 30 2021
 
 * Fix broken firewall counter metrics by incrementing (@timoreimann)
diff --git a/cloud-controller-manager/do/firewall_controller.go b/cloud-controller-manager/do/firewall_controller.go
@@ -170,8 +170,9 @@ func (fc *FirewallController) processNextItem() bool {
 	if err != nil {
 		klog.Errorf("failed to process worker item: %v", err)
 		fc.queue.AddRateLimited(key)
+	} else {
+		fc.queue.Forget(key)
 	}
-	fc.queue.Forget(key)
 	return true
 }
 

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,9 @@ func (fc *FirewallController) processNextItem() bool {`
`170`	`170`	`if err != nil {`
`171`	`171`	`klog.Errorf("failed to process worker item: %v", err)`
`172`	`172`	`fc.queue.AddRateLimited(key)`
	`173`	`+ } else {`
	`174`	`+ fc.queue.Forget(key)`
`173`	`175`	`}`
`174`		`- fc.queue.Forget(key)`
`175`	`176`	`return true`
`176`	`177`	`}`
`177`	`178`