diff --git a/pkg/cmd/internal/issues/condense.go b/pkg/cmd/internal/issues/condense.go
index d206c3d9f322..ea4430a26d09 100644
--- a/pkg/cmd/internal/issues/condense.go
+++ b/pkg/cmd/internal/issues/condense.go
@@ -15,6 +15,18 @@ import (
"strings"
)
+func firstNlines(input string, n int) string {
+ if input == "" {
+ return ""
+ }
+ pos := 0
+ for pos < len(input) && n > 0 {
+ n--
+ pos += strings.Index(input[pos:], "\n") + 1
+ }
+ return input[:pos]
+}
+
func lastNlines(input string, n int) string {
if input == "" {
return ""
@@ -34,6 +46,14 @@ type FatalOrPanic struct {
FirstStack string // the first stack, i.e. the goroutine relevant to error
}
+// RSGCrash contains information about a crash during random syntax tests
+// obtained from a test log.
+type RSGCrash struct {
+ Error, // the error message from the crash
+ Query, // the query that induced the crash
+ Schema string // the schema that the crash was induced with
+}
+
// A CondensedMessage is a test log output garnished with useful helper methods
// that extract concise information for seamless debugging.
type CondensedMessage string
@@ -41,15 +61,20 @@ type CondensedMessage string
var panicRE = regexp.MustCompile(`(?ms)^(panic:.*?\n)(goroutine \d+.*?\n)\n`)
var fatalRE = regexp.MustCompile(`(?ms)(^F\d{6}.*?\n)(goroutine \d+.*?\n)\n`)
+// Note: These must be kept in-sync with the crash output of
+// tests_test.testRandomSyntax.
+var crasherRE = regexp.MustCompile(`(?s)( *rsg_test.go:\d{3}: Crash detected:.*?\n)(.*?;\n)`)
+var reproRE = regexp.MustCompile(`(?s)( *rsg_test.go:\d{3}: To reproduce, use schema:)`)
+
// FatalOrPanic constructs a FatalOrPanic. If no fatal or panic occurred in the
-// test, the zero value is returned.
-func (s CondensedMessage) FatalOrPanic(numPrecedingLines int) FatalOrPanic {
+// test, ok=false is returned.
+func (s CondensedMessage) FatalOrPanic(numPrecedingLines int) (fop FatalOrPanic, ok bool) {
ss := string(s)
- var fop FatalOrPanic
add := func(matches []int) {
fop.LastLines = lastNlines(ss[:matches[2]], numPrecedingLines)
fop.Error += ss[matches[2]:matches[3]]
fop.FirstStack += ss[matches[4]:matches[5]]
+ ok = true
}
if sl := panicRE.FindStringSubmatchIndex(ss); sl != nil {
add(sl)
@@ -57,7 +82,25 @@ func (s CondensedMessage) FatalOrPanic(numPrecedingLines int) FatalOrPanic {
if sl := fatalRE.FindStringSubmatchIndex(ss); sl != nil {
add(sl)
}
- return fop
+ return fop, ok
+}
+
+// RSGCrash constructs an RSGCrash. The query and reproduction SQL are limited
+// to the first lineLimit lines. If no random syntax test crash occurred in the
+// test, ok=false is returned.
+func (s CondensedMessage) RSGCrash(lineLimit int) (c RSGCrash, ok bool) {
+ ss := string(s)
+ if cm := crasherRE.FindStringSubmatchIndex(ss); cm != nil {
+ c.Error = ss[cm[2]:cm[3]]
+ c.Query = firstNlines(ss[cm[4]:cm[5]], lineLimit)
+ if rm := reproRE.FindStringSubmatchIndex(ss); rm != nil {
+ // The "To reproduce" log is always near the end of the log file, so
+ // collect all lines after the first match position.
+ c.Schema = firstNlines(ss[rm[2]:], lineLimit)
+ }
+ return c, true
+ }
+ return RSGCrash{}, false
}
// String calls .Digest(30).
@@ -66,12 +109,17 @@ func (s CondensedMessage) String() string {
}
// Digest returns the last n lines of the test log. If a panic or fatal error
-// occurred, it instead returns the last n lines preceding that event, the
-// event itself, and the first stack trace.
+// occurred, it instead returns the last n lines preceding that event, the event
+// itself, and the first stack trace. If a crash occurred during a random syntax
+// test, it returns the error and up to n lines of both the query that caused
+// the crash and the database schema.
func (s CondensedMessage) Digest(n int) string {
- if fop := s.FatalOrPanic(n); fop.Error != "" {
+ if fop, ok := s.FatalOrPanic(n); ok {
return fop.LastLines + fop.Error + fop.FirstStack
}
+ if c, ok := s.RSGCrash(n); ok {
+ return c.Error + c.Query + c.Schema
+ }
// TODO(tbg): consider adding some smarts around the FAIL line here to handle
// it similarly to FatalOrPanic (but without a stack trace).
return lastNlines(string(s), n)
diff --git a/pkg/cmd/internal/issues/condense_test.go b/pkg/cmd/internal/issues/condense_test.go
index a30cf770c1db..4529fd01ce65 100644
--- a/pkg/cmd/internal/issues/condense_test.go
+++ b/pkg/cmd/internal/issues/condense_test.go
@@ -77,8 +77,28 @@ created by main.main
exit status 2
`
+const rsgCrash = ` rsg_test.go:755: Crash detected: server panic: pq: internal error: something bad
+ SELECT
+ foo
+ FROM
+ bar
+ LIMIT
+ 33:::INT8;
+`
+
+const rsgRepro = ` rsg_test.go:575: To reproduce, use schema:
+ rsg_test.go:577:
+ CREATE TABLE table1 (col1_0 BOOL);
+ ;
+ rsg_test.go:577:
+ CREATE TYPE greeting AS ENUM ('hello', 'hi');
+ ;
+ rsg_test.go:579:
+`
+
const panic5Lines = fiveLines + messagePanic + firstStack + restStack
const fatal5Lines = fiveLines + messageFatal + firstStack + restStack
+const crashAndRepro = fiveLines + rsgCrash + fiveLines + rsgRepro
var errorCases = []condenseTestCase{
{
@@ -109,6 +129,16 @@ var errorCases = []condenseTestCase{
messageFatal + firstStack,
0,
},
+ {
+ crashAndRepro,
+ rsgCrash + rsgRepro,
+ 100,
+ },
+ {
+ crashAndRepro,
+ " rsg_test.go:755: Crash detected: server panic: pq: internal error: something bad\n",
+ 0,
+ },
}
var lineCases = []condenseTestCase{
diff --git a/pkg/cmd/internal/issues/formatter_unit.go b/pkg/cmd/internal/issues/formatter_unit.go
index baa379154309..e137d9a71603 100644
--- a/pkg/cmd/internal/issues/formatter_unit.go
+++ b/pkg/cmd/internal/issues/formatter_unit.go
@@ -41,7 +41,7 @@ var UnitTestFormatter = IssueFormatter{
r.Escaped(`:
`)
- if fop := data.CondensedMessage.FatalOrPanic(50); fop != (FatalOrPanic{}) {
+ if fop, ok := data.CondensedMessage.FatalOrPanic(50); ok {
if fop.Error != "" {
r.Escaped("Fatal error:")
r.CodeBlock("", fop.Error)
@@ -54,6 +54,15 @@ var UnitTestFormatter = IssueFormatter{
r.Collapsed("Log preceding fatal error", func() {
r.CodeBlock("", fop.LastLines)
})
+ } else if rsgCrash, ok := data.CondensedMessage.RSGCrash(100); ok {
+ r.Escaped("Random syntax error:")
+ r.CodeBlock("", rsgCrash.Error)
+ r.Escaped("Query:")
+ r.CodeBlock("", rsgCrash.Query)
+ if rsgCrash.Schema != "" {
+ r.Escaped("Schema:")
+ r.CodeBlock("", rsgCrash.Schema)
+ }
} else {
r.CodeBlock("", data.CondensedMessage.Digest(50))
}
diff --git a/pkg/cmd/internal/issues/issues_test.go b/pkg/cmd/internal/issues/issues_test.go
index e1e6ca6471f5..348835302672 100644
--- a/pkg/cmd/internal/issues/issues_test.go
+++ b/pkg/cmd/internal/issues/issues_test.go
@@ -111,6 +111,37 @@ goroutine 13:
author: "bran",
reproCmd: "",
},
+ {
+ name: "rsg-crash",
+ packageName: "github.com/cockroachdb/cockroach/pkg/sql/tests",
+ testName: "TestRandomSyntaxSQLSmith",
+ message: `logging something
+ rsg_test.go:755: Crash detected: server panic: pq: internal error: something bad
+ SELECT
+ foo
+ FROM
+ bar
+ LIMIT
+ 33:::INT8;
+
+ Stack trace:
+ rsg_test.go:764: 266003 executions, 235459 successful
+ rsg_test.go:575: To reproduce, use schema:
+ rsg_test.go:577:
+ CREATE TABLE table1 (col1_0 BOOL);
+ ;
+ rsg_test.go:577:
+
+ CREATE TYPE greeting AS ENUM ('hello', 'howdy', 'hi', 'good day', 'morning');
+ ;
+ rsg_test.go:579:
+ rsg_test.go:580: -- test log scope end --
+test logs left over in: /go/src/github.com/cockroachdb/cockroach/artifacts/logTestRandomSyntaxSQLSmith460792454
+--- FAIL: TestRandomSyntaxSQLSmith (300.69s)
+`,
+ author: "bran",
+ reproCmd: "make test TESTS=TestRandomSyntaxSQLSmith PKG=./pkg/sql/tests 2>&1",
+ },
}
const (
diff --git a/pkg/cmd/internal/issues/testdata/post/rsg-crash-matching-and-related-issue.txt b/pkg/cmd/internal/issues/testdata/post/rsg-crash-matching-and-related-issue.txt
new file mode 100644
index 000000000000..1f18793d8d44
--- /dev/null
+++ b/pkg/cmd/internal/issues/testdata/post/rsg-crash-matching-and-related-issue.txt
@@ -0,0 +1,68 @@
+listCommits owner=cockroachdb repo=cockroach github.CommitsListOptions{SHA:"", Path:"", Author:"bran", Since:time.Time{wall:, ext:}, Until:time.Time{wall:, ext:}, ListOptions:github.ListOptions{Page:0, PerPage:1}}
+searchIssue repo:"cockroach" user:"cockroachdb" is:issue is:open in:title label:"C-test-failure" sort:created-desc "sql/tests: TestRandomSyntaxSQLSmith failed" label:branch-release-0.1: [github.Issue{Number:30, Title:"boom", Labels:[github.Label{URL:"fake", Name:"C-test-failure"} github.Label{URL:"fake", Name:"O-robot"} github.Label{URL:"fake", Name:"release-0.1"}]}]
+searchIssue repo:"cockroach" user:"cockroachdb" is:issue is:open in:title label:"C-test-failure" sort:created-desc "sql/tests: TestRandomSyntaxSQLSmith failed" -label:branch-release-0.1: [github.Issue{Number:31, Title:"boom related", Labels:[github.Label{URL:"fake", Name:"C-test-failure"} github.Label{URL:"fake", Name:"O-robot"} github.Label{URL:"fake", Name:"release-0.2"}]}]
+createComment owner=cockroachdb repo=cockroach issue=30:
+
+sql/tests.TestRandomSyntaxSQLSmith [failed](https://teamcity.example.com/viewLog.html?buildId=8008135&tab=buildLog) on release-0.1 @ [abcd123](https://github.com/cockroachdb/cockroach/commits/abcd123):
+
+Random syntax error:
+
+```
+ rsg_test.go:755: Crash detected: server panic: pq: internal error: something bad
+```
+Query:
+
+```
+ SELECT
+ foo
+ FROM
+ bar
+ LIMIT
+ 33:::INT8;
+```
+Schema:
+
+```
+ rsg_test.go:575: To reproduce, use schema:
+ rsg_test.go:577:
+ CREATE TABLE table1 (col1_0 BOOL);
+ ;
+ rsg_test.go:577:
+
+ CREATE TYPE greeting AS ENUM ('hello', 'howdy', 'hi', 'good day', 'morning');
+ ;
+ rsg_test.go:579:
+ rsg_test.go:580: -- test log scope end --
+test logs left over in: /go/src/github.com/cockroachdb/cockroach/artifacts/logTestRandomSyntaxSQLSmith460792454
+--- FAIL: TestRandomSyntaxSQLSmith (300.69s)
+```
+Reproduce
+
+
To reproduce, try:
+
+```bash
+make test TESTS=TestRandomSyntaxSQLSmith PKG=./pkg/sql/tests 2>&1
+```
+
+Parameters in this failure:
+
+- TAGS=deadlock
+
+- GOFLAGS=race
+
+
+Same failure on other branches
+
+
+- #31 boom related [C-test-failure O-robot release-0.2]
+
+Reproduce
+
+
To reproduce, try:
+
+```bash
+make test TESTS=TestRandomSyntaxSQLSmith PKG=./pkg/sql/tests 2>&1
+```
+
+Parameters in this failure:
+
+- TAGS=deadlock
+
+- GOFLAGS=race
+
+
+Reproduce
+
+
To reproduce, try:
+
+```bash
+make test TESTS=TestRandomSyntaxSQLSmith PKG=./pkg/sql/tests 2>&1
+```
+
+Parameters in this failure:
+
+- TAGS=deadlock
+
+- GOFLAGS=race
+
+
+Reproduce
+
+
To reproduce, try:
+
+```bash
+make test TESTS=TestRandomSyntaxSQLSmith PKG=./pkg/sql/tests 2>&1
+```
+
+Parameters in this failure:
+
+- TAGS=deadlock
+
+- GOFLAGS=race
+
+
+Same failure on other branches
+
+
+- #31 boom related [C-test-failure O-robot release-0.2]
+
+