Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Print query that caused a panic #10995

Merged
merged 1 commit into from
Jul 14, 2022
Merged

Print query that caused a panic #10995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions promql/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ func (ev *evaluator) error(err error) {
}

// recover is the handler that turns panics into returns from the top level of evaluation.
func (ev *evaluator) recover(ws *storage.Warnings, errp *error) {
func (ev *evaluator) recover(expr parser.Expr, ws *storage.Warnings, errp *error) {
e := recover()
if e == nil {
return
Expand All @@ -949,7 +949,7 @@ func (ev *evaluator) recover(ws *storage.Warnings, errp *error) {
buf := make([]byte, 64<<10)
buf = buf[:runtime.Stack(buf, false)]

level.Error(ev.logger).Log("msg", "runtime panic in parser", "err", e, "stacktrace", string(buf))
level.Error(ev.logger).Log("msg", "runtime panic in parser", "expr", expr.String(), "err", e, "stacktrace", string(buf))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is "in parser" correct? Won't this happen for panic during evaluation too?

*errp = fmt.Errorf("unexpected error: %w", err)
case errWithWarnings:
*errp = err.err
Expand All @@ -960,7 +960,7 @@ func (ev *evaluator) recover(ws *storage.Warnings, errp *error) {
}

func (ev *evaluator) Eval(expr parser.Expr) (v parser.Value, ws storage.Warnings, err error) {
defer ev.recover(&ws, &err)
defer ev.recover(expr, &ws, &err)

v, ws = ev.eval(expr)
return v, ws, nil
Expand Down
22 changes: 16 additions & 6 deletions promql/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,17 +1641,27 @@ load 1ms
}

func TestRecoverEvaluatorRuntime(t *testing.T) {
ev := &evaluator{logger: log.NewNopLogger()}
var output []interface{}
logger := log.Logger(log.LoggerFunc(func(keyvals ...interface{}) error {
output = append(output, keyvals...)
return nil
}))
ev := &evaluator{logger: logger}

expr, _ := parser.ParseExpr("sum(up)")

var err error
defer ev.recover(nil, &err)

defer func() {
require.EqualError(t, err, "unexpected error: runtime error: index out of range [123] with length 0")
require.Contains(t, output, "sum(up)")
}()
defer ev.recover(expr, nil, &err)

// Cause a runtime panic.
var a []int
//nolint:govet
a[123] = 1

require.EqualError(t, err, "unexpected error")
}

func TestRecoverEvaluatorError(t *testing.T) {
Expand All @@ -1663,7 +1673,7 @@ func TestRecoverEvaluatorError(t *testing.T) {
defer func() {
require.EqualError(t, err, e.Error())
}()
defer ev.recover(nil, &err)
defer ev.recover(nil, nil, &err)

panic(e)
}
Expand All @@ -1683,7 +1693,7 @@ func TestRecoverEvaluatorErrorWithWarnings(t *testing.T) {
require.EqualError(t, err, e.Error())
require.Equal(t, warnings, ws, "wrong warning message")
}()
defer ev.recover(&ws, &err)
defer ev.recover(nil, &ws, &err)

panic(e)
}
Expand Down