External/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2025-12-18 07:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: data race while getting cached series

Browse Source
This commit is contained in:
nityanandagohain 2025-07-01 20:19:22 +05:30
parent 9daefeb881
commit 18fa83ebfa
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/query-service/querycache/query_range_cache.go
View File

@ -236,7 +236,14 @@ func (q *queryCache) FindMissingTimeRanges(orgID valuer.UUID, start, end, step i
func (q *queryCache) getCachedSeriesData(orgID valuer.UUID, cacheKey string) []*CachedSeriesData { func (q *queryCache) getCachedSeriesData(orgID valuer.UUID, cacheKey string) []*CachedSeriesData {
cacheableSeriesData := new(CacheableSeriesData) cacheableSeriesData := new(CacheableSeriesData)
err := q.cache.Get(context.TODO(), orgID, cacheKey, cacheableSeriesData, true) tmpcacheableSeriesData := new(CacheableSeriesData)
err := q.cache.Get(context.TODO(), orgID, cacheKey, tmpcacheableSeriesData, true)
data, err := tmpcacheableSeriesData.MarshalBinary()
if err != nil {
zap.L().Error("error marshalling cacheable series data", zap.Error(err))
}
cacheableSeriesData.UnmarshalBinary(data)
if err != nil && !errors.Ast(err, errors.TypeNotFound) { if err != nil && !errors.Ast(err, errors.TypeNotFound) {
return nil return nil
} }
@ -300,11 +307,18 @@ func (q *queryCache) MergeWithCachedSeriesDataV2(orgID valuer.UUID, cacheKey str
return newData return newData
} }
tmpcacheableSeriesData := new(CacheableSeriesData)
cacheableSeriesData := new(CacheableSeriesData) cacheableSeriesData := new(CacheableSeriesData)
err := q.cache.Get(context.TODO(), orgID, cacheKey, cacheableSeriesData, true) err := q.cache.Get(context.TODO(), orgID, cacheKey, tmpcacheableSeriesData, true)
if err != nil && !errors.Ast(err, errors.TypeNotFound) { if err != nil && !errors.Ast(err, errors.TypeNotFound) {
return nil return nil
} }
data, err := tmpcacheableSeriesData.MarshalBinary()
if err != nil {
zap.L().Error("error marshalling cacheable series data", zap.Error(err))
}
cacheableSeriesData.UnmarshalBinary(data)
allData := append(cacheableSeriesData.Series, newData...) allData := append(cacheableSeriesData.Series, newData...)
sort.Slice(allData, func(i, j int) bool { sort.Slice(allData, func(i, j int) bool {