Skip to content

Commit

Permalink
vtgate: Allow more errors for the warning check
Browse files Browse the repository at this point in the history
The MySQL shutdown is racy, so we might also see this message that it's
still shutting down.

Improves the test flakyness hopefully of these tests.

Signed-off-by: Dirkjan Bussink <[email protected]>
  • Loading branch information
dbussink committed Nov 1, 2023
1 parent b26a2d1 commit b1eee3f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions go/test/endtoend/vtgate/errors_as_warnings/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ func TestScatterErrsAsWarns(t *testing.T) {
utils.Exec(t, mode.conn, fmt.Sprintf("set workload = %s", mode.m))

utils.AssertMatches(t, mode.conn, query1, `[[INT64(4)]]`)
assertContainsOneOf(t, mode.conn, showQ, "no valid tablet", "no healthy tablet", "mysql.sock: connect: no such file or directory")
assertContainsOneOf(t, mode.conn, showQ, "operation not allowed in state SHUTTING_DOWN", "no valid tablet", "no healthy tablet", "mysql.sock: connect: no such file or directory")
utils.AssertMatches(t, mode.conn, query2, `[[INT64(4)]]`)
assertContainsOneOf(t, mode.conn, showQ, "no valid tablet", "no healthy tablet", "mysql.sock: connect: no such file or directory")
assertContainsOneOf(t, mode.conn, showQ, "operation not allowed in state SHUTTING_DOWN", "no valid tablet", "no healthy tablet", "mysql.sock: connect: no such file or directory")

// invalid_field should throw error and not warning
_, err = mode.conn.ExecuteFetch("SELECT /*vt+ PLANNER=Gen4 SCATTER_ERRORS_AS_WARNINGS */ invalid_field from t1;", 1, false)
Expand Down

0 comments on commit b1eee3f

Please sign in to comment.