Backport of Fix for cache context to save cache data in entries on context cancel into release/1.22.x (#23266)

pajay-rao · web-flow · commit f6d4f4d18593 · 2026-02-24T23:29:29.000+05:30
Fix for cache context to save cache data in entries on context cancel
diff --git a/agent/cache/cache.go b/agent/cache/cache.go
@@ -676,8 +676,6 @@ func (c *Cache) fetch(ctx context.Context, key string, r getOptions, allowNew bo
 		select {
 		case <-handle.stopCh:
 			return
-		case <-ctx.Done():
-			return
 		default:
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -676,8 +676,6 @@ func (c *Cache) fetch(ctx context.Context, key string, r getOptions, allowNew bo`
`676`	`676`	`select {`
`677`	`677`	`case <-handle.stopCh:`
`678`	`678`	`return`
`679`		`- case <-ctx.Done():`
`680`		`- return`
`681`	`679`	`default:`
`682`	`680`	`}`
`683`	`681`