mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Return errors from populateSeries

Browse source
This commit is contained in:
Thomas Jackson 2021-02-01 16:35:45 -08:00 committed by Rishabh Kumar
parent fbeaec447f
commit 3dc8c4fc91
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
promql/engine.go
View file

@ -727,7 +727,10 @@ func (ng *Engine) execEvalStmt(ctx context.Context, query *query, s *parser.Eval
} }
defer querier.Close() defer querier.Close()
ng.populateSeries(ctxPrepare, querier, s) if err := ng.populateSeries(ctxPrepare, querier, s); err != nil {
prepareSpanTimer.Finish()
return nil, nil, err
}
prepareSpanTimer.Finish() prepareSpanTimer.Finish()
// Modify the offset of vector and matrix selectors for the @ modifier // Modify the offset of vector and matrix selectors for the @ modifier
@ -957,7 +960,7 @@ func (ng *Engine) getLastSubqueryInterval(path []parser.Node) time.Duration {
return interval return interval
} }
func (ng *Engine) populateSeries(ctx context.Context, querier storage.Querier, s *parser.EvalStmt) { func (ng *Engine) populateSeries(ctx context.Context, querier storage.Querier, s *parser.EvalStmt) error {
// Whenever a MatrixSelector is evaluated, evalRange is set to the corresponding range. // Whenever a MatrixSelector is evaluated, evalRange is set to the corresponding range.
// The evaluation of the VectorSelector inside then evaluates the given range and unsets // The evaluation of the VectorSelector inside then evaluates the given range and unsets
// the variable. // the variable.
@ -992,12 +995,14 @@ func (ng *Engine) populateSeries(ctx context.Context, querier storage.Querier, s
}, ng.NodeReplacer) }, ng.NodeReplacer)
if err != nil { if err != nil {
panic(err) return err
} }
if nTyped, ok := n.(parser.Expr); ok { if nTyped, ok := n.(parser.Expr); ok {
s.Expr = nTyped s.Expr = nTyped
} }
return nil
} }
// extractFuncFromPath walks up the path and searches for the first instance of // extractFuncFromPath walks up the path and searches for the first instance of