Merge pull request #2589 from rzetelskik/fix-observer-nonretriable

scylla-operator-bot[bot] · web-flow · commit 64e0841d44f8 · 2025-04-15T10:31:41.000Z
Forget keys on nonretriable errors in observer
diff --git a/pkg/controllertools/observer.go b/pkg/controllertools/observer.go
@@ -110,6 +110,8 @@ func (o *Observer) processNextItem(ctx context.Context) bool {
 	default:
 		if IsNonRetriable(err) {
 			klog.InfoS("Hit non-retriable error. Dropping the item from the queue.", "Error", err)
+			o.queue.Forget(key)
+			return true
 		}
 		utilruntime.HandleError(fmt.Errorf("sync loop has failed: %w", err))
 	}

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ func (o *Observer) processNextItem(ctx context.Context) bool {`
`110`	`110`	`default:`
`111`	`111`	`if IsNonRetriable(err) {`
`112`	`112`	`klog.InfoS("Hit non-retriable error. Dropping the item from the queue.", "Error", err)`
	`113`	`+ o.queue.Forget(key)`
	`114`	`+ return true`
`113`	`115`	`}`
`114`	`116`	`utilruntime.HandleError(fmt.Errorf("sync loop has failed: %w", err))`
`115`	`117`	`}`