root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 73 Packages Projects Releases Wiki Activity

Create context with deadline inside goroutine. (#110297)

This commit is contained in:
Peter Štibraný 2025-08-28 17:33:34 +02:00 committed by GitHub
parent b92f007894
commit ad571b50e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/storage/unified/resource/search_client.go
View File

@ -115,10 +115,10 @@ func (s *searchWrapper) GetStats(ctx context.Context, in *resourcepb.ResourceSta
if s.features != nil && s.features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearchDualReaderEnabled) && !unified { if s.features != nil && s.features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearchDualReaderEnabled) && !unified {
// Create background context with timeout but ignore parent cancelation // Create background context with timeout but ignore parent cancelation
ctxBg := context.WithoutCancel(ctx) ctxBg := context.WithoutCancel(ctx)
ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout)
// Make background call without blocking the main request // Make background call without blocking the main request
go func() { go func() {
ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout)
defer cancel() // Ensure we clean up the context defer cancel() // Ensure we clean up the context
_, bgErr := s.unifiedClient.GetStats(ctxBgWithTimeout, in, opts...) _, bgErr := s.unifiedClient.GetStats(ctxBgWithTimeout, in, opts...)
if bgErr != nil { 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 // Create background context with timeout but ignore parent cancelation
ctxBg := context.WithoutCancel(ctx) ctxBg := context.WithoutCancel(ctx)
ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout)
// Make background call and compare results // Make background call and compare results
go func() { go func() {
ctxBgWithTimeout, cancel := context.WithTimeout(ctxBg, backgroundRequestTimeout)
defer cancel() // Ensure we clean up the context defer cancel() // Ensure we clean up the context
unifiedResponse, bgErr := s.unifiedClient.Search(ctxBgWithTimeout, in, opts...) unifiedResponse, bgErr := s.unifiedClient.Search(ctxBgWithTimeout, in, opts...)
if bgErr != nil { if bgErr != nil {