Fix ClusterStateRestCancellationIT #72407
Merged
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
Take into account that the task can be cancelled after the check has been performed and it could trip the assertion. Closes elastic#72056
fcofdez
added
>test
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
Contributor
Author
|
@elasticmachine update branch |
DaveCTurner
reviewed
Apr 29, 2021
| // It is possible that the task is cancelled after the predicate has been executed, therefore we should take | ||
| // that into account as well for the assertion | ||
| assert acceptableClusterStateOrFailedPredicate.test(state) == false | ||
| || request.local() == false && cancellableTask.isCancelled(); |
Contributor
There was a problem hiding this comment.
I was expecting the cancellableTask.isCancelled() here but not the request.local() check. Digging into why that's needed led me to conclude that there's a bug in #67413: local requests should also complete on the first cluster state update after cancellation.
Contributor
Author
There was a problem hiding this comment.
You're right, I've moved the cancellation check outside of acceptableClusterStateOrFailedPredicate making it deterministic given the same ClusterState. Now we check for cancellation in local requests too.
…cofdez/elasticsearch into fix-cluster-state-rest-cancellation-it
…est-cancellation-it
DaveCTurner
approved these changes
Apr 29, 2021
| clusterStateRequest.addParameter("wait_for_metadata_version", Long.toString(Long.MAX_VALUE)); | ||
| clusterStateRequest.addParameter("wait_for_timeout", "1h"); | ||
| if (randomBoolean()) { | ||
| clusterStateRequest.addParameter("local", "true"); |
fcofdez
added a commit
to fcofdez/elasticsearch
that referenced
this pull request
Apr 29, 2021
Take into account task cancellation for local requests too Closes elastic#72056 Backport of elastic#72407
fcofdez
added a commit
that referenced
this pull request
Apr 29, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Take into account that the task can be cancelled after the check for
acceptableClusterStateOrFailedPredicate has been performed and
it could trip the assertion.
Closes #72056