Browse Source

Fix goroutine leak in lexer/parser. (#4858)

When there was an error in the parser, the
lexer goroutine was left running.

Also make runtime panic test actually test things.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
pull/4861/head
Brian Brazil 6 years ago committed by GitHub
parent
commit
8edaa8ad4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      promql/lex.go
  2. 1
      promql/parse.go
  3. 19
      promql/parse_test.go

7
promql/lex.go

@ -434,6 +434,13 @@ func (l *lexer) run() {
close(l.items) close(l.items)
} }
// Release resources used by lexer.
func (l *lexer) close() {
for range l.items {
// Consume.
}
}
// lineComment is the character that starts a line comment. // lineComment is the character that starts a line comment.
const lineComment = "#" const lineComment = "#"

1
promql/parse.go

@ -337,6 +337,7 @@ func (p *parser) recover(errp *error) {
*errp = e.(error) *errp = e.(error)
} }
} }
p.lex.close()
} }
// expr parses any expression. // expr parses any expression.

19
promql/parse_test.go

@ -1581,21 +1581,26 @@ func TestParseSeries(t *testing.T) {
} }
func TestRecoverParserRuntime(t *testing.T) { func TestRecoverParserRuntime(t *testing.T) {
var p *parser p := newParser("foo bar")
var err error var err error
defer p.recover(&err)
// Cause a runtime panic.
var a []int
a[123] = 1
defer func() {
if err != errUnexpected { if err != errUnexpected {
t.Fatalf("wrong error message: %q, expected %q", err, errUnexpected) t.Fatalf("wrong error message: %q, expected %q", err, errUnexpected)
} }
if _, ok := <-p.lex.items; ok {
t.Fatalf("lex.items was not closed")
}
}()
defer p.recover(&err)
// Cause a runtime panic.
var a []int
a[123] = 1
} }
func TestRecoverParserError(t *testing.T) { func TestRecoverParserError(t *testing.T) {
var p *parser p := newParser("foo bar")
var err error var err error
e := fmt.Errorf("custom error") e := fmt.Errorf("custom error")

Loading…
Cancel
Save