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

app/vmselect: mention the original query and time range in error messages

Browse Source 
This should simplify debugging invalid or heavy queries.
This commit is contained in:
Aliaksandr Valialkin 2020-01-22 17:32:11 +02:00
parent 18a4503261
commit e1a264173a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/vmselect/main.go
View File

@ -285,7 +285,7 @@ func deleteHandler(w http.ResponseWriter, r *http.Request, p *httpserver.Path, a
} }
func sendPrometheusError(w http.ResponseWriter, r *http.Request, err error) { func sendPrometheusError(w http.ResponseWriter, r *http.Request, err error) {
logger.Errorf("error in %q: %s", r.URL.Path, err) logger.Errorf("error in %q: %s", r.RequestURI, err)
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
statusCode := http.StatusUnprocessableEntity statusCode := http.StatusUnprocessableEntity

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

@ -145,7 +145,7 @@ func ExportHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) error
end = start + 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 fmt.Errorf("error when exporting data for queries=%q on the time range (start=%d, end=%d): %s", matches, start, end, err)
} }
exportDuration.UpdateDuration(startTime) exportDuration.UpdateDuration(startTime)
return nil return nil
@ -657,7 +657,7 @@ func QueryHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) error
end := start end := start
start = end - window start = end - window
if err := exportHandler(at, w, []string{childQuery}, start, end, "promapi", deadline); err != nil { if err := exportHandler(at, w, []string{childQuery}, start, end, "promapi", deadline); err != nil {
return err return fmt.Errorf("error when exporting data for query=%q on the time range (start=%d, end=%d): %s", childQuery, start, end, err)
} }
queryDuration.UpdateDuration(startTime) queryDuration.UpdateDuration(startTime)
return nil return nil
@ -682,7 +682,7 @@ func QueryHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) error
end := start end := start
start = end - window start = end - window
if err := queryRangeHandler(at, w, childQuery, start, end, step, r, ct); err != nil { if err := queryRangeHandler(at, w, childQuery, start, end, step, r, ct); err != nil {
return err return fmt.Errorf("error when executing query=%q on the time range (start=%d, end=%d, step=%d): %s", childQuery, start, end, step, err)
} }
queryDuration.UpdateDuration(startTime) queryDuration.UpdateDuration(startTime)
return nil return nil
@ -700,7 +700,7 @@ func QueryHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) error
} }
result, err := promql.Exec(&ec, query, true) result, err := promql.Exec(&ec, query, true)
if err != nil { if err != nil {
return fmt.Errorf("cannot execute %q: %s", query, err) return fmt.Errorf("error when executing query=%q for (time=%d, step=%d): %s", query, start, step, err)
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
@ -749,7 +749,7 @@ func QueryRangeHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) e
return err return err
} }
if err := queryRangeHandler(at, w, query, start, end, step, r, ct); err != nil { if err := queryRangeHandler(at, w, query, start, end, step, r, ct); err != nil {
return err return fmt.Errorf("error when executing query=%q on the time range (start=%d, end=%d, step=%d): %s", query, start, end, step, err)
} }
queryRangeDuration.UpdateDuration(startTime) queryRangeDuration.UpdateDuration(startTime)
return nil return nil
@ -790,7 +790,7 @@ func queryRangeHandler(at *auth.Token, w http.ResponseWriter, query string, star
} }
result, err := promql.Exec(&ec, query, false) result, err := promql.Exec(&ec, query, false)
if err != nil { if err != nil {
return fmt.Errorf("cannot execute %q: %s", query, err) return fmt.Errorf("cannot execute query: %s", err)
} }
queryOffset := getLatencyOffsetMilliseconds() queryOffset := getLatencyOffsetMilliseconds()
if ct-end < queryOffset { if ct-end < queryOffset {