Fix query failure race to preserve original failure cause #20582
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
Prep for adding more parameterization
findepi
force-pushed
the
findepi/rgroups
branch
2 times, most recently
from
e523ac9 to
9a9bff2
Compare
|
Added a unit test. |
findepi
commented
Feb 5, 2024
| cancellingThread.get(10, SECONDS); | ||
| anotherThread.get(10, SECONDS); | ||
|
|
||
| // TODO queryStateMachine.getFinalQueryInfo() does not exist for cancelled queries, but may be created by anotherThread due to a race |
There was a problem hiding this comment.
For some reason transitionToFailed and transitionToCanceled have different code paths and only first sets finalQueryInfo. that's probably a miss in 8a89c29?
cc @JamesRTaylor
There was a problem hiding this comment.
good question. don't know
findepi
force-pushed
the
findepi/rgroups
branch
from
9a9bff2 to
a64aeb2
Compare
losipiuk
approved these changes
Feb 5, 2024
sopel39
approved these changes
Feb 6, 2024
| @@ -1123,12 +1133,16 @@ public boolean transitionToFailed(Throwable throwable) | |||
|
|
|||
| QueryState oldState = queryState.trySet(FAILED); | |||
| if (oldState.isDone()) { | |||
| QUERY_STATE_LOG.debug(throwable, "Failure after query %s finished", queryId); | |||
| if (log) { | |||
There was a problem hiding this comment.
is it not a separate commit already?
| cancellingThread.get(10, SECONDS); | ||
| anotherThread.get(10, SECONDS); | ||
|
|
||
| // TODO queryStateMachine.getFinalQueryInfo() does not exist for cancelled queries, but may be created by anotherThread due to a race |
sopel39
reviewed
Feb 6, 2024
|
|
||
| boolean canceled = queryState.setIf(FAILED, currentState -> !currentState.isDone()); | ||
| if (canceled) { | ||
| session.getTransactionId().flatMap(transactionManager::getTransactionInfoIfExist).ifPresent(transaction -> { |
There was a problem hiding this comment.
in the common method called from here
There was a problem hiding this comment.
unless i missed something, please check
|
mind automation |
Before the change there was a race around `QueryStateMachine.transitionToFailed`: - Thread A: failure occurs, calls `transitionToFailed` with a specific exception (the original failure cause) - Thread A: calls `cleanupQueryQuietly`, which calls listeners, which e.g. unregisters a query from `LanguageFunctionManager` - Thread B is within `StatementAnalyzer` and calls `LanguageFunctionManager.getQueryFunctions`, which fails with `IllegalStateException` - Thread B catches the exception and fails the query; calls `transitionToFailed` - Thread B sets `failureCause` to `IllegalStateException` caught above - Thread A invokes `failureCause.compareAndSet` and sees non-empty reference; the original query failure cause is lost
Before commit 8a89c29, the only difference between `transitionToCanceled` and `transitionToFailed` seemed to be logging the failure thru QUERY_STATE_LOG. After that commit, one of those methods sets `finalQueryInfo` to ensure it's set. Unify the handling to ensure `finalQueryInfo` is set for `transitionToCanceled` as well.
findepi
force-pushed
the
findepi/rgroups
branch
from
3b74db0 to
9257118
Compare
|
prev CI failed #19799 |
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.
Before the change there was a race around
QueryStateMachine.transitionToFailed:transitionToFailedwith a specificexception (the original failure cause)
cleanupQueryQuietly, which calls listeners, whiche.g. unregisters a query from
LanguageFunctionManagerStatementAnalyzerand callsLanguageFunctionManager.getQueryFunctions, which fails withIllegalStateExceptiontransitionToFailedfailureCausetoIllegalStateExceptioncaught abovefailureCause.compareAndSetand sees non-emptyreference; the original query failure cause is lost
Fixes #20551