Skip to content

[9.0] [Test] Wait all results to be gathered before assertion (#134279) #134423

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 1 commit into from
Sep 10, 2025
Merged

[9.0] [Test] Wait all results to be gathered before assertion (#134279) #134423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 8 additions & 10 deletions server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -378,28 +377,24 @@ protected void newResponseAsync(
public void testConcurrentlyCompletionAndCancellation() throws InterruptedException {
final var action = getTestTransportNodesAction();

final CountDownLatch onCancelledLatch = new CountDownLatch(1);
final CancellableTask cancellableTask = new CancellableTask(randomLong(), "transport", "action", "", null, emptyMap()) {
@Override
protected void onCancelled() {
onCancelledLatch.countDown();
}
};
final CancellableTask cancellableTask = new CancellableTask(randomLong(), "transport", "action", "", null, emptyMap());

final PlainActionFuture<TestNodesResponse> future = new PlainActionFuture<>();
action.execute(cancellableTask, new TestNodesRequest(), future);

final List<TestNodeResponse> nodeResponses = new ArrayList<>();
final CapturingTransport.CapturedRequest[] capturedRequests = transport.getCapturedRequestsAndClear();
// Complete all but the last request for racing completion with cancellation
for (int i = 0; i < capturedRequests.length - 1; i++) {
final var capturedRequest = capturedRequests[i];
nodeResponses.add(completeOneRequest(capturedRequest));
}

final var raceBarrier = new CyclicBarrier(3);
final var lastResponseFuture = new PlainActionFuture<TestNodeResponse>();
final Thread completeThread = new Thread(() -> {
safeAwait(raceBarrier);
nodeResponses.add(completeOneRequest(capturedRequests[capturedRequests.length - 1]));
lastResponseFuture.onResponse(completeOneRequest(capturedRequests[capturedRequests.length - 1]));
});
final Thread cancelThread = new Thread(() -> {
safeAwait(raceBarrier);
Expand All @@ -419,8 +414,11 @@ protected void onCancelled() {
assertNotNull("expect task cancellation exception, but got\n" + ExceptionsHelper.stackTrace(e), taskCancelledException);
assertThat(e.getMessage(), containsString("task cancelled [simulated]"));
assertTrue(cancellableTask.isCancelled());
safeAwait(onCancelledLatch); // wait for the latch, the listener for releasing node responses is called before it
// All previously captured responses are released due to cancellation
assertTrue(nodeResponses.stream().allMatch(r -> r.hasReferences() == false));
// Wait for the last response to be gathered and assert it is also released by either the concurrent cancellation or
// not tracked in onItemResponse at all due to already cancelled
assertFalse(safeGet(lastResponseFuture).hasReferences());
}

completeThread.join(10_000);
Expand Down