github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-01-20 15:16:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

app/vmselect/netstorage: release search resources on timeout errors

Browse source 
Previously these resources weren't released, which could lead to resource leaks.
This commit is contained in:
Aliaksandr Valialkin 2020-09-22 22:56:49 +03:00
parent 36eb5427eb
commit 09b0f7c202
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/vmselect/netstorage/netstorage.go
View file

@ -616,6 +616,7 @@ func ProcessSearchQuery(sq *storage.SearchQuery, fetchData bool, deadline search
for sr.NextMetricBlock() {
blocksRead++
if deadline.Exceeded() {
putStorageSearch(sr)
return nil, fmt.Errorf("timeout exceeded while fetching data block #%d from storage: %s", blocksRead, deadline.String())
}
metricName := sr.MetricBlockRef.MetricName
@ -632,6 +633,7 @@ func ProcessSearchQuery(sq *storage.SearchQuery, fetchData bool, deadline search
}
}
if err := sr.Error(); err != nil {
putStorageSearch(sr)
if errors.Is(err, storage.ErrDeadlineExceeded) {
return nil, fmt.Errorf("timeout exceeded during the query: %s", deadline.String())
}