Don't re-enqueue deletion if context is cancelled

brandond · brandond · commit e96d35e6ec53 · 2025-10-28T16:55:09.000Z
Signed-off-by: Brad Davidson &lt;brad.davidson@rancher.com&gt;
diff --git a/pkg/logstructured/logstructured.go b/pkg/logstructured/logstructured.go
@@ -339,7 +339,7 @@ func (l *LogStructured) handleTTLEvents(ctx context.Context, rwMutex *sync.RWMut
 	}
 
 	logrus.Tracef("TTL delete key=%v, modRev=%v", eventKV.key, eventKV.modRevision)
-	if _, _, _, err := l.Delete(ctx, eventKV.key, eventKV.modRevision); err != nil {
+	if _, _, _, err := l.Delete(ctx, eventKV.key, eventKV.modRevision); err != nil && !errors.Is(err, context.Canceled) {
 		logrus.Errorf("TTL delete trigger failed for key=%v: %v, requeuing", eventKV.key, err)
 		queue.AddAfter(eventKV.key, retryInterval)
 		return true

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ func (l LogStructured) handleTTLEvents(ctx context.Context, rwMutex sync.RWMut`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`logrus.Tracef("TTL delete key=%v, modRev=%v", eventKV.key, eventKV.modRevision)`
`342`		`- if _, _, _, err := l.Delete(ctx, eventKV.key, eventKV.modRevision); err != nil {`
	`342`	`+ if _, _, _, err := l.Delete(ctx, eventKV.key, eventKV.modRevision); err != nil && !errors.Is(err, context.Canceled) {`
`343`	`343`	`logrus.Errorf("TTL delete trigger failed for key=%v: %v, requeuing", eventKV.key, err)`
`344`	`344`	`queue.AddAfter(eventKV.key, retryInterval)`
`345`	`345`	`return true`