Skip to content

Simplify testSearchWhileRelocating #128095

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

Simplify testSearchWhileRelocating #128095

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09021af
Simplify testSearchWhileRelocating
idegtiarenko May 16, 2025
5f6a5c1
add thread name
idegtiarenko May 19, 2025
309ca09
Merge branch 'main' into simplify_testSearchWhileRelocating
idegtiarenko May 19, 2025
97c244b
Merge branch 'main' into simplify_testSearchWhileRelocating
idegtiarenko May 19, 2025
ad6a9e9
add thread number
idegtiarenko May 19, 2025
1315169
Merge branch 'main' into simplify_testSearchWhileRelocating
idegtiarenko May 19, 2025
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
11 changes: 5 additions & 6 deletions ...internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSenderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@

import java.util.Collection;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.LongAdder;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.xpack.esql.EsqlTestUtils.as;
import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasSize;

public class DataNodeRequestSenderIT extends AbstractEsqlIntegTestCase {
Expand All @@ -52,17 +50,19 @@ public void testSearchWhileRelocating() throws InterruptedException {

// start background searches
var stopped = new AtomicBoolean(false);
var queries = new LongAdder();
var threads = new Thread[randomIntBetween(1, 5)];
for (int i = 0; i < threads.length; i++) {
threads[i] = new Thread(() -> {
while (stopped.get() == false) {
try (EsqlQueryResponse resp = run("FROM index-1")) {
assertThat(getValuesList(resp), hasSize(docs));
} catch (Exception | AssertionError e) {
logger.warn("Query failed with exception", e);
stopped.set(true);
throw e;
}
queries.increment();
}
});
}, "testSearchWhileRelocating");
Copy link
Member

@nik9000 nik9000 May 19, 2025

Choose a reason for hiding this comment

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

Would it help to have the i in the name?

Copy link
Contributor Author

@idegtiarenko idegtiarenko May 19, 2025

Choose a reason for hiding this comment

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

I would say it is not to important as long as we can identify this is the the source of the threads if they ever picked up by leak detector

Copy link
Contributor Author

@idegtiarenko idegtiarenko May 19, 2025

Choose a reason for hiding this comment

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

Although, there is no disadvantage in having it, will add shortly.

}
for (Thread thread : threads) {
thread.start();
Expand Down Expand Up @@ -93,7 +93,6 @@ public void testSearchWhileRelocating() throws InterruptedException {
.prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
.setPersistentSettings(Settings.builder().putNull("cluster.routing.allocation.exclude._name"))
.get();
assertThat(queries.sum(), greaterThan((long) threads.length));
}

public void testRetryOnShardMovement() {
Expand Down