Skip to content

[8.17] Fix RestCancellableNodeClientTests (#128085) #128088

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
May 15, 2025
Merged

[8.17] Fix RestCancellableNodeClientTests (#128085) #128088

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
21 changes: 10 additions & 11 deletions server/src/test/java/org/elasticsearch/rest/action/RestCancellableNodeClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.TransportSearchAction;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.action.support.SubscribableListener;
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.set.Sets;
Expand All @@ -44,7 +45,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.LongSupplier;

public class RestCancellableNodeClientTests extends ESTestCase {
Expand Down Expand Up @@ -79,7 +79,9 @@ public void testCompletedTasks() throws Exception {
for (int j = 0; j < numTasks; j++) {
PlainActionFuture<SearchResponse> actionFuture = new PlainActionFuture<>();
RestCancellableNodeClient client = new RestCancellableNodeClient(testClient, channel);
threadPool.generic().submit(() -> client.execute(TransportSearchAction.TYPE, new SearchRequest(), actionFuture));
futures.add(
threadPool.generic().submit(() -> client.execute(TransportSearchAction.TYPE, new SearchRequest(), actionFuture))
);
futures.add(actionFuture);
}
}
Expand Down Expand Up @@ -150,7 +152,7 @@ public void testChannelAlreadyClosed() {
assertEquals(totalSearches, testClient.cancelledTasks.size());
}

public void testConcurrentExecuteAndClose() throws Exception {
public void testConcurrentExecuteAndClose() {
final var testClient = new TestClient(Settings.EMPTY, threadPool, true);
int initialHttpChannels = RestCancellableNodeClient.getNumChannels();
int numTasks = randomIntBetween(1, 30);
Expand Down Expand Up @@ -254,7 +256,7 @@ public String getLocalNodeId() {

private class TestHttpChannel implements HttpChannel {
private final AtomicBoolean open = new AtomicBoolean(true);
private final AtomicReference<ActionListener<Void>> closeListener = new AtomicReference<>();
private final SubscribableListener<ActionListener<Void>> closeListener = new SubscribableListener<>();
private final CountDownLatch closeLatch = new CountDownLatch(1);

@Override
Expand All @@ -273,8 +275,7 @@ public InetSocketAddress getRemoteAddress() {
@Override
public void close() {
assertTrue("HttpChannel is already closed", open.compareAndSet(true, false));
ActionListener<Void> listener = closeListener.get();
if (listener != null) {
closeListener.andThenAccept(listener -> {
boolean failure = randomBoolean();
threadPool.generic().submit(() -> {
if (failure) {
Expand All @@ -284,11 +285,10 @@ public void close() {
}
closeLatch.countDown();
});
}
});
}

private void awaitClose() throws InterruptedException {
assertNotNull("must set closeListener before calling awaitClose", closeListener.get());
close();
closeLatch.await();
}
Expand All @@ -304,9 +304,8 @@ public void addCloseListener(ActionListener<Void> listener) {
if (open.get() == false) {
listener.onResponse(null);
} else {
if (closeListener.compareAndSet(null, listener) == false) {
throw new AssertionError("close listener already set, only one is allowed!");
}
assertFalse("close listener already set, only one is allowed!", closeListener.isDone());
closeListener.onResponse(ActionListener.assertOnce(listener));
}
}
}
Expand Down