-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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.
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
sql: deflake TestPerfLogging #75119
sql: deflake TestPerfLogging #75119
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @cucaroach and @rytaft)
pkg/sql/event_log_test.go, line 412 at r1 (raw file):
query: `INSERT INTO t(i) VALUES (6)`, errRe: ``, logRe: `"EventType":"txn_rows_written_limit"`,
nit: probably could make this regex more specific too
pkg/sql/event_log_test.go, line 486 at r1 (raw file):
query: `INSERT INTO t(i) VALUES (15), (16)`, errRe: `pq: txn has written 2 rows, which is above the limit: TxnID .* SessionID .*`, logRe: `"EventType":"txn_rows_written_limit"`,
ditto
pkg/sql/event_log_test.go, line 493 at r1 (raw file):
query: `SELECT * FROM t WHERE i = 6`, errRe: ``, logRe: `"EventType":"txn_rows_read_limit"`,
ditto
This commit deflakes TestPerfLogging by ensuring that test cases that should not produce log entries do not match with unrelated log entries and thus cause the test to fail. This is ensured by making the regex more precise for the specific test case. Fixes cockroachdb#74811 Release note: None
a33f059
to
311c2e0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TFTR!
bors r+
Reviewable status: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @cucaroach and @yuzefovich)
pkg/sql/event_log_test.go, line 412 at r1 (raw file):
Previously, yuzefovich (Yahor Yuzefovich) wrote…
nit: probably could make this regex more specific too
Done.
pkg/sql/event_log_test.go, line 486 at r1 (raw file):
Previously, yuzefovich (Yahor Yuzefovich) wrote…
ditto
Done.
pkg/sql/event_log_test.go, line 493 at r1 (raw file):
Previously, yuzefovich (Yahor Yuzefovich) wrote…
ditto
Done.
Build succeeded: |
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from 311c2e0 to blathers/backport-release-21.1-75119: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 21.1.x failed. See errors above. error creating merge commit from 311c2e0 to blathers/backport-release-21.2-75119: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 21.2.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan. |
This commit deflakes
TestPerfLogging
by ensuring that test casesthat should not produce log entries do not match with unrelated log
entries and thus cause the test to fail. This is ensured by making
the regex more precise for the specific test case.
Fixes #74811
Release note: None