Skip to content

Fix concurrent list in merge test #131186

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 5 commits into from
Jul 15, 2025
Merged

Fix concurrent list in merge test #131186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3822909
Fix concurrent list in merge test
kingherc Jul 14, 2025
58efd8f
Convert to set
kingherc Jul 15, 2025
070ce16
Merge remote-tracking branch 'origin/main' into test-issue/131165-mer…
kingherc Jul 15, 2025
e811735
Merge remote-tracking branch 'origin/main' into test-issue/131165-mer…
kingherc Jul 15, 2025
fb11a16
Unmute
kingherc Jul 15, 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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,9 +520,6 @@ tests:
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
method: test {lookup-join.MvJoinKeyOnFromAfterStats ASYNC}
issue: https://github.com/elastic/elasticsearch/issues/131148
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
method: testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges
issue: https://github.com/elastic/elasticsearch/issues/131165
- class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT
method: testLookupJoinAliases
issue: https://github.com/elastic/elasticsearch/issues/131166
Expand Down
6 changes: 4 additions & 2 deletions ...est/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.core.PathUtils;
import org.elasticsearch.core.PathUtilsForTesting;
Expand All @@ -40,6 +41,7 @@
import java.util.IdentityHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -898,8 +900,8 @@ public void testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges() th
assertBusy(
() -> assertThat(threadPoolMergeExecutorService.getDiskSpaceAvailableForNewMergeTasks(), is(expectedAvailableBudget.get()))
);
List<ThreadPoolMergeScheduler.MergeTask> tasksRunList = new ArrayList<>();
List<ThreadPoolMergeScheduler.MergeTask> tasksAbortList = new ArrayList<>();
Set<ThreadPoolMergeScheduler.MergeTask> tasksRunList = ConcurrentCollections.newConcurrentSet();
Set<ThreadPoolMergeScheduler.MergeTask> tasksAbortList = ConcurrentCollections.newConcurrentSet();
int submittedMergesCount = randomIntBetween(1, 5);
long[] mergeSizeEstimates = new long[submittedMergesCount];
for (int i = 0; i < submittedMergesCount; i++) {
Expand Down