@@ -290,6 +290,7 @@ func (c *APIClient) resubscribeWithBackoffFn(id string) func(context.Context, ui
 		return nil
 	}
 	return func(ctx context.Context, fromChange uint64) (*Subscription, error) {
+		boff := backoff.WithContext(c.newResubBackoff(), ctx)
 		return backoff.RetryWithData(func() (*Subscription, error) {
 			sub, err := c.ResubscribeContext(ctx, id, fromChange)
 			if err != nil {
@@ -300,11 +301,14 @@ func (c *APIClient) resubscribeWithBackoffFn(id string) func(context.Context, ui
 						"id", id, "from_change", fromChange)
 					return nil, backoff.Permanent(fmt.Errorf("resubscribe to %s: %w", id, err))
 				}
-				slog.Debug("Failed to resubscribe to Corrosion query. Retrying with backoff.",
-					"id", id, "from_change", fromChange, "err", err)
+				// Don't log retries triggered by context cancellation, the backoff will stop immediately.
+				if ctx.Err() == nil {
+					slog.Debug("Failed to resubscribe to Corrosion query. Retrying with backoff.",
+						"id", id, "from_change", fromChange, "err", err)
+				}
 			}
 			return sub, err
-		}, c.newResubBackoff())
+		}, boff)
 	}
 }
 
 
@@ -620,7 +620,7 @@ func (cc *clusterController) syncDockerContainers(ctx context.Context) error {
 		return nil
 	}
 	if err := backoff.Retry(watchAndSync, boff); err != nil {
-		if errors.Is(err, context.Canceled) {
+		if ctx.Err() != nil {
 			return nil
 		}
 		return fmt.Errorf("watch and sync containers to cluster store: %w", err)
 
@@ -139,7 +139,7 @@ func (c *Controller) WatchAndSyncContainers(ctx context.Context) error {
 				return fmt.Errorf("sync containers to cluster store: %w", err)
 			}
 		case err := <-errCh:
-			if errors.Is(err, context.Canceled) {
+			if ctx.Err() != nil {
 				return nil
 			}
 			return fmt.Errorf("receive Docker event: %w", err)
Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ func (c *APIClient) resubscribeWithBackoffFn(id string) func(context.Context, ui`
`290`	`290`	`return nil`
`291`	`291`	`}`
`292`	`292`	`return func(ctx context.Context, fromChange uint64) (*Subscription, error) {`
	`293`	`+ boff := backoff.WithContext(c.newResubBackoff(), ctx)`
`293`	`294`	`return backoff.RetryWithData(func() (*Subscription, error) {`
`294`	`295`	`sub, err := c.ResubscribeContext(ctx, id, fromChange)`
`295`	`296`	`if err != nil {`
`@@ -300,11 +301,14 @@ func (c *APIClient) resubscribeWithBackoffFn(id string) func(context.Context, ui`
`300`	`301`	`"id", id, "from_change", fromChange)`
`301`	`302`	`return nil, backoff.Permanent(fmt.Errorf("resubscribe to %s: %w", id, err))`
`302`	`303`	`}`
`303`		`- slog.Debug("Failed to resubscribe to Corrosion query. Retrying with backoff.",`
`304`		`- "id", id, "from_change", fromChange, "err", err)`
	`304`	`+ // Don't log retries triggered by context cancellation, the backoff will stop immediately.`
	`305`	`+ if ctx.Err() == nil {`
	`306`	`+ slog.Debug("Failed to resubscribe to Corrosion query. Retrying with backoff.",`
	`307`	`+ "id", id, "from_change", fromChange, "err", err)`
	`308`	`+ }`
`305`	`309`	`}`
`306`	`310`	`return sub, err`
`307`		`- }, c.newResubBackoff())`
	`311`	`+ }, boff)`
`308`	`312`	`}`
`309`	`313`	`}`
`310`	`314`
Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ func (cc *clusterController) syncDockerContainers(ctx context.Context) error {`
`620`	`620`	`return nil`
`621`	`621`	`}`
`622`	`622`	`if err := backoff.Retry(watchAndSync, boff); err != nil {`
`623`		`- if errors.Is(err, context.Canceled) {`
	`623`	`+ if ctx.Err() != nil {`
`624`	`624`	`return nil`
`625`	`625`	`}`
`626`	`626`	`return fmt.Errorf("watch and sync containers to cluster store: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func (c *Controller) WatchAndSyncContainers(ctx context.Context) error {`
`139`	`139`	`return fmt.Errorf("sync containers to cluster store: %w", err)`
`140`	`140`	`}`
`141`	`141`	`case err := <-errCh:`
`142`		`- if errors.Is(err, context.Canceled) {`
	`142`	`+ if ctx.Err() != nil {`
`143`	`143`	`return nil`
`144`	`144`	`}`
`145`	`145`	`return fmt.Errorf("receive Docker event: %w", err)`