diff --git a/muted-tests.yml b/muted-tests.yml index d5e1713408d8a..55d9803943fca 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -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 diff --git a/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java b/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java index 33a86ef5709ad..9f34c56cf041e 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java @@ -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; @@ -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; @@ -898,8 +900,8 @@ public void testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges() th assertBusy( () -> assertThat(threadPoolMergeExecutorService.getDiskSpaceAvailableForNewMergeTasks(), is(expectedAvailableBudget.get())) ); - List tasksRunList = new ArrayList<>(); - List tasksAbortList = new ArrayList<>(); + Set tasksRunList = ConcurrentCollections.newConcurrentSet(); + Set tasksAbortList = ConcurrentCollections.newConcurrentSet(); int submittedMergesCount = randomIntBetween(1, 5); long[] mergeSizeEstimates = new long[submittedMergesCount]; for (int i = 0; i < submittedMergesCount; i++) {