release-19.1: sql: fix the auto-retry counter in stats + log it in statement/audit logs #38035
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
|
I don't think we should backport the second commit. Changing the exec/audit log format in a patch release is a bad idea. (Adding a column at the end is backwards-compatible if you've designed your parser to accept unknown extra columns, but not everyone does that right and it's not something we want to risk in a patch release). |
|
Ok I removed the 2nd commit. |
The statement statistics contain a column `max_retries` intended to show the maximum number of times a statement was retried. Due to a bug, this counter was previously always zero, *even for statements that were actually retried*. We hadn't noticed because there was no test to ensure that the value would increase. This patch fixes the bugs and verifies that the value does indeed increase. Release note (bug fix): The `max_retries` column in the statement statistics now properly displays the maximum number of times a statement was retried.
The retry timeout was too short for `make stress`. Instead this patch copies the timeout already used in the other logic test file `txn`. I verified manually that `make stress` is pleased with the new timeout. Also fix a typo in the test comment. Release note: None
Requested by @rytaft. Release note: None
|
@jordanlewis friendly ping |
|
LGTM, merge away. Thanks @knz! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 1/2 commits from #38028.
Backport 1/1 commits from #38051.
Backport 1/1 commits from #38078.
/cc @cockroachdb/release