-
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 TestTrackOnlyUserOpenTransactionsAndActiveStatements #120505
sql: deflake TestTrackOnlyUserOpenTransactionsAndActiveStatements #120505
Conversation
This changes the test to block in AfterExecute rather than OnTxnFinish, which should make the active statements assertion less flaky. It also fixes a bug where the SELECT FOR UPDATE was not in a txn. Release note: None
0726f79
to
d6fd42f
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.
Reviewed 5 of 5 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @abarganier, @msbutler, and @rafiss)
pkg/sql/conn_executor_test.go
line 1669 at r1 (raw file):
params := base.TestServerArgs{} params.Knobs.SQLExecutor = &sql.ExecutorTestingKnobs{ AfterExecute: func(ctx context.Context, stmt string, isInternal bool, err error) {
I'm guessing this was because OnRecordTxnFinish
tftr! bors r+ |
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 d6fd42f to blathers/backport-release-23.1-120505: 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 23.1.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
This changes the test to block in AfterExecute rather than OnTxnFinish, which should make the active statements assertion less flaky.
It also fixes a testing bug where the SELECT FOR UPDATE was not in a txn.
fixes #120042
fixes #120235
fixes #119829
Release note: None