github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-09 15:27:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

vmselect: fix vmselect cache partial result when timeout (#1085)

Browse source
This commit is contained in:
weng zhao 2021-02-24 17:39:56 +08:00 committed by GitHub
parent d16effc29e
commit 4805b80977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1704,16 +1704,14 @@ func (sn *storageNode) processSearchMetricNames(requestData []byte, deadline sea
}
func (sn *storageNode) processSearchQuery(requestData []byte, fetchData bool, processBlock func(mb *storage.MetricBlock) error, deadline searchutils.Deadline) error {
var blocksRead int
f := func(bc *handshake.BufferedConn) error {
n, err := sn.processSearchQueryOnConn(bc, requestData, fetchData, processBlock)
_, err := sn.processSearchQueryOnConn(bc, requestData, fetchData, processBlock)
if err != nil {
return err
}
blocksRead = n
return nil
}
if err := sn.execOnConn("search_v4", f, deadline); err != nil && blocksRead == 0 {
if err := sn.execOnConn("search_v4", f, deadline); err != nil {
// Try again before giving up if zero blocks read on the previous attempt.
if err = sn.execOnConn("search_v4", f, deadline); err != nil {
return err