From ad571b50e9fb4fb662ebd399664f1dc1c3b78e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Thu, 28 Aug 2025 17:33:34 +0200 Subject: [PATCH] Create context with deadline inside goroutine. (#110297) --- pkg/storage/unified/resource/search_client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/storage/unified/resource/search_client.go b/pkg/storage/unified/resource/search_client.go index 08596f67ab3..551472cea50 100644 --- a/pkg/storage/unified/resource/search_client.go +++ b/pkg/storage/unified/resource/search_client.go @@ -115,10 +115,10 @@ func (s *searchWrapper) GetStats(ctx context.Context, in *resourcepb.ResourceSta if s.features != nil && s.features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearchDualReaderEnabled) && !unified { // Create background context with timeout but ignore parent cancelation ctxBg := context.WithoutCancel(ctx) - ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout) // Make background call without blocking the main request go func() { + ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout) defer cancel() // Ensure we clean up the context _, bgErr := s.unifiedClient.GetStats(ctxBgWithTimeout, in, opts...) if bgErr != nil { @@ -154,10 +154,10 @@ func (s *searchWrapper) Search(ctx context.Context, in *resourcepb.ResourceSearc // Create background context with timeout but ignore parent cancelation ctxBg := context.WithoutCancel(ctx) - ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout) // Make background call and compare results go func() { + ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout) defer cancel() // Ensure we clean up the context unifiedResponse, bgErr := s.unifiedClient.Search(ctxBgWithTimeout, in, opts...) if bgErr != nil {