Skip to content

Fix ClusterStateRestCancellationIT #72407

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Apr 29, 2021
Merged

Fix ClusterStateRestCancellationIT #72407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49b1252
Fix ClusterStateRestCancellationIT
fcofdez Apr 28, 2021
e116a4d
Merge branch 'master' into fix-cluster-state-rest-cancellation-it
elasticmachine Apr 29, 2021
d593be9
Move cancellation check outside of predicate
fcofdez Apr 29, 2021
eb39abf
Merge branch 'fix-cluster-state-rest-cancellation-it' of github.com:f…
fcofdez Apr 29, 2021
a14ca63
Merge remote-tracking branch 'origin/master' into fix-cluster-state-r…
fcofdez Apr 29, 2021
98c908f
Add extra check
fcofdez Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions qa/smoke-test-http/src/test/java/org/elasticsearch/http/ClusterStateRestCancellationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ public void testClusterStateRestCancellation() throws Exception {
final Request clusterStateRequest = new Request(HttpGet.METHOD_NAME, "/_cluster/state");
clusterStateRequest.addParameter("wait_for_metadata_version", Long.toString(Long.MAX_VALUE));
clusterStateRequest.addParameter("wait_for_timeout", "1h");
if (randomBoolean()) {
clusterStateRequest.addParameter("local", "true");
Copy link
Contributor

@DaveCTurner DaveCTurner Apr 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

final PlainActionFuture<Void> future = new PlainActionFuture<>();
logger.info("--> sending cluster state request");
Expand Down
7 changes: 3 additions & 4 deletions ...c/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ protected void masterOperation(Task task, final ClusterStateRequest request, fin

final Predicate<ClusterState> acceptableClusterStateOrFailedPredicate = request.local()
? acceptableClusterStatePredicate
: acceptableClusterStatePredicate.or(clusterState ->
cancellableTask.isCancelled() || clusterState.nodes().isLocalNodeElectedMaster() == false);
: acceptableClusterStatePredicate.or(clusterState -> clusterState.nodes().isLocalNodeElectedMaster() == false);

if (acceptableClusterStatePredicate.test(state)) {
if (acceptableClusterStatePredicate.test(state) && cancellableTask.isCancelled() == false) {
ActionListener.completeWith(listener, () -> buildResponse(request, state));
} else {
assert acceptableClusterStateOrFailedPredicate.test(state) == false;
Expand Down Expand Up @@ -112,7 +111,7 @@ public void onTimeout(TimeValue timeout) {
listener.onFailure(e);
}
}
}, acceptableClusterStateOrFailedPredicate);
}, clusterState -> cancellableTask.isCancelled() || acceptableClusterStateOrFailedPredicate.test(clusterState));
}
}

Expand Down