Avoid blocking backfilling transaction if context is blocked while writing to the events channel

aruiz14 · aruiz14 · commit 15853574ccf8 · 2025-11-26T16:11:26.000+01:00
diff --git a/pkg/sqlcache/informer/listoption_indexer.go b/pkg/sqlcache/informer/listoption_indexer.go
@@ -366,10 +366,15 @@ func (l *ListOptionIndexer) Watch(ctx context.Context, opts WatchOptions, events
 				continue
 			}
 
-			eventsCh <- watch.Event{
+			ev := watch.Event{
 				Type:   eventType,
 				Object: obj,
 			}
+			select {
+			case eventsCh <- ev:
+			case <-ctx.Done():
+				return ctx.Err()
+			}
 		}
 		return rows.Err()
 	}); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -366,10 +366,15 @@ func (l *ListOptionIndexer) Watch(ctx context.Context, opts WatchOptions, events`
`366`	`366`	`continue`
`367`	`367`	`}`
`368`	`368`
`369`		`- eventsCh <- watch.Event{`
	`369`	`+ ev := watch.Event{`
`370`	`370`	`Type: eventType,`
`371`	`371`	`Object: obj,`
`372`	`372`	`}`
	`373`	`+ select {`
	`374`	`+ case eventsCh <- ev:`
	`375`	`+ case <-ctx.Done():`
	`376`	`+ return ctx.Err()`
	`377`	`+ }`
`373`	`378`	`}`
`374`	`379`	`return rows.Err()`
`375`	`380`	`}); err != nil {`