Skip to content

Commit c2f102d

Browse files
committed
Fix concurrent list in merge test (elastic#131186)
Relates elastic#131165
1 parent be7f820 commit c2f102d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

muted-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,4 +411,4 @@ tests:
411411
issue: https://github.com/elastic/elasticsearch/issues/126085
412412
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
413413
method: test {yaml=reference/search/retriever/line_906}
414-
issue: https://github.com/elastic/elasticsearch/issues/131041
414+
issue: https://github.com/elastic/elasticsearch/issues/131041

server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.common.settings.ClusterSettings;
1515
import org.elasticsearch.common.settings.Settings;
1616
import org.elasticsearch.common.unit.ByteSizeValue;
17+
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
1718
import org.elasticsearch.common.util.concurrent.EsExecutors;
1819
import org.elasticsearch.core.PathUtils;
1920
import org.elasticsearch.core.PathUtilsForTesting;
@@ -40,6 +41,7 @@
4041
import java.util.IdentityHashMap;
4142
import java.util.LinkedHashSet;
4243
import java.util.List;
44+
import java.util.Set;
4345
import java.util.concurrent.CountDownLatch;
4446
import java.util.concurrent.Executor;
4547
import java.util.concurrent.TimeUnit;
@@ -897,8 +899,8 @@ public void testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges() th
897899
assertBusy(
898900
() -> assertThat(threadPoolMergeExecutorService.getDiskSpaceAvailableForNewMergeTasks(), is(expectedAvailableBudget.get()))
899901
);
900-
List<ThreadPoolMergeScheduler.MergeTask> tasksRunList = new ArrayList<>();
901-
List<ThreadPoolMergeScheduler.MergeTask> tasksAbortList = new ArrayList<>();
902+
Set<ThreadPoolMergeScheduler.MergeTask> tasksRunList = ConcurrentCollections.newConcurrentSet();
903+
Set<ThreadPoolMergeScheduler.MergeTask> tasksAbortList = ConcurrentCollections.newConcurrentSet();
902904
int submittedMergesCount = randomIntBetween(1, 5);
903905
long[] mergeSizeEstimates = new long[submittedMergesCount];
904906
for (int i = 0; i < submittedMergesCount; i++) {

0 commit comments

Comments
 (0)