Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-15 08:23:34 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

app/vmselect: adjust end arg instead of adjusting start arg if start > end

Browse Source 
`start` arg has higher chances to be set properly comparing to `end` arg,
so it is expected that the `end` arg could be adjusted if it was set incorrectly.
This commit is contained in:
Aliaksandr Valialkin 2019-11-22 16:10:33 +02:00
parent 14ba958e9a
commit 17d08c1fe0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/vmselect/prometheus/prometheus.go
View File

@ -140,7 +140,7 @@ func ExportHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) error
format := r.FormValue("format") format := r.FormValue("format")
deadline := getDeadline(r) deadline := getDeadline(r)
if start >= end { if start >= end {
start = end - defaultStep end = start + defaultStep
} }
if err := exportHandler(at, w, matches, start, end, format, deadline); err != nil { if err := exportHandler(at, w, matches, start, end, format, deadline); err != nil {
return err return err
@ -343,7 +343,7 @@ func labelValuesWithMatches(at *auth.Token, labelName string, matches []string,
return nil, false, err return nil, false, err
} }
if start >= end { if start >= end {
start = end - defaultStep end = start + defaultStep
} }
sq := &storage.SearchQuery{ sq := &storage.SearchQuery{
AccountID: at.AccountID, AccountID: at.AccountID,
@ -478,7 +478,7 @@ func SeriesHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) error
return err return err
} }
if start >= end { if start >= end {
start = end - defaultStep end = start + defaultStep
} }
sq := &storage.SearchQuery{ sq := &storage.SearchQuery{
AccountID: at.AccountID, AccountID: at.AccountID,
@ -642,7 +642,7 @@ func QueryRangeHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) e
return fmt.Errorf(`too long query; got %d bytes; mustn't exceed %d bytes`, len(query), *maxQueryLen) return fmt.Errorf(`too long query; got %d bytes; mustn't exceed %d bytes`, len(query), *maxQueryLen)
} }
if start > end { if start > end {
start = end end = start + defaultStep
} }
if err := promql.ValidateMaxPointsPerTimeseries(start, end, step); err != nil { if err := promql.ValidateMaxPointsPerTimeseries(start, end, step); err != nil {
return err return err