sql: enforce statement_timeout on descriptor waits #160076
Open
+140
−70
Conversation
This file contains hidden or 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
Member
|
This change is |
Previously, when a schema change was execute with a statement_timeout, we would enforce any statement timeouts on the job waits. However, there was also additional logic to wait for descriptors, that could apply afterwards. This patch, ensures that any extra logic complies with the statement_timeout, which will generate a similar query timeout error. Fixes: cockroachdb#158272 Release note: None
fqazi
force-pushed
the
fixStatementTimeoutForWait
branch
from
aeb79b8 to
20cddef
Compare
Collaborator
Author
|
@rafiss Can you take a look at this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Previously, when a schema change was execute with a statement_timeout, we would enforce any statement timeouts on the job waits. However, there was also additional logic to wait for descriptors, that could apply afterwards. This patch, ensures that any extra logic complies with the statement_timeout, which will generate a similar query timeout error.
Fixes: #158272
Release note: None