Skip to content

Commit 6cc05c6

Browse files
ywangdywangd
committed
use lightweight thread pool
1 parent 3962106 commit 6cc05c6

File tree

5 files changed

+18
-50
lines changed

5 files changed

+18
-50
lines changed

‎modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AwsS3ServiceImplTests.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import org.elasticsearch.cluster.project.TestProjectResolvers;
2626
import org.elasticsearch.common.settings.MockSecureSettings;
2727
import org.elasticsearch.common.settings.Settings;
28+
import org.elasticsearch.common.util.concurrent.DeterministicTaskQueue;
2829
import org.elasticsearch.env.Environment;
2930
import org.elasticsearch.test.ClusterServiceUtils;
3031
import org.elasticsearch.test.ESTestCase;
31-
import org.elasticsearch.threadpool.TestThreadPool;
3232
import org.elasticsearch.watcher.ResourceWatcherService;
3333
import org.mockito.ArgumentCaptor;
3434
import org.mockito.Mockito;
@@ -235,10 +235,9 @@ private void assertEndpoint(Settings repositorySettings, Settings settings, Stri
235235

236236
public void testEndPointAndRegionOverrides() throws IOException {
237237
try (
238-
TestThreadPool threadPool = new TestThreadPool(getTestName());
239238
S3Service s3Service = new S3Service(
240239
mock(Environment.class),
241-
ClusterServiceUtils.createClusterService(threadPool),
240+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
242241
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
243242
mock(ResourceWatcherService.class),
244243
() -> Region.of("es-test-region")
@@ -253,7 +252,6 @@ public void testEndPointAndRegionOverrides() throws IOException {
253252
assertEquals("es-test-region", reference.client().serviceClientConfiguration().region().toString());
254253

255254
reference.close();
256-
s3Service.doClose();
257255
}
258256
}
259257

‎modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import org.elasticsearch.test.ClusterServiceUtils;
5959
import org.elasticsearch.test.ESTestCase;
6060
import org.elasticsearch.test.MockLog;
61-
import org.elasticsearch.threadpool.TestThreadPool;
6261
import org.elasticsearch.watcher.ResourceWatcherService;
6362
import org.hamcrest.Matcher;
6463
import org.junit.After;
@@ -122,18 +121,16 @@
122121
public class S3BlobContainerRetriesTests extends AbstractBlobContainerRetriesTestCase {
123122

124123
private static final int MAX_NUMBER_SNAPSHOT_DELETE_RETRIES = 10;
125-
private TestThreadPool threadPool;
126124
private S3Service service;
127125
private volatile boolean shouldErrorOnDns;
128126
private RecordingMeterRegistry recordingMeterRegistry;
129127

130128
@Before
131129
public void setUp() throws Exception {
132130
shouldErrorOnDns = false;
133-
threadPool = new TestThreadPool(getTestClass().getName());
134131
service = new S3Service(
135132
Mockito.mock(Environment.class),
136-
ClusterServiceUtils.createClusterService(threadPool),
133+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
137134
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
138135
Mockito.mock(ResourceWatcherService.class),
139136
() -> null
@@ -172,7 +169,6 @@ Optional<Duration> getConnectionAcquisitionTimeout() {
172169
@After
173170
public void tearDown() throws Exception {
174171
IOUtils.close(service);
175-
threadPool.close();
176172
super.tearDown();
177173
}
178174

@@ -1320,7 +1316,10 @@ public void testRetryOn403InStateless() {
13201316

13211317
service = new S3Service(
13221318
Mockito.mock(Environment.class),
1323-
ClusterServiceUtils.createClusterService(threadPool, Settings.builder().put(STATELESS_ENABLED_SETTING_NAME, "true").build()),
1319+
ClusterServiceUtils.createClusterService(
1320+
new DeterministicTaskQueue().getThreadPool(),
1321+
Settings.builder().put(STATELESS_ENABLED_SETTING_NAME, "true").build()
1322+
),
13241323
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
13251324
Mockito.mock(ResourceWatcherService.class),
13261325
() -> null

‎modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3ClientSettingsTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import org.elasticsearch.cluster.project.TestProjectResolvers;
1717
import org.elasticsearch.common.settings.MockSecureSettings;
1818
import org.elasticsearch.common.settings.Settings;
19+
import org.elasticsearch.common.util.concurrent.DeterministicTaskQueue;
1920
import org.elasticsearch.env.Environment;
2021
import org.elasticsearch.test.ClusterServiceUtils;
2122
import org.elasticsearch.test.ESTestCase;
22-
import org.elasticsearch.threadpool.TestThreadPool;
2323
import org.elasticsearch.watcher.ResourceWatcherService;
2424
import org.mockito.Mockito;
2525

@@ -185,10 +185,9 @@ public void testRegionCanBeSet() {
185185
assertThat(settings.get("other").region, is(randomRegion));
186186

187187
try (
188-
TestThreadPool threadPool = new TestThreadPool(getTestName());
189188
var s3Service = new S3Service(
190189
Mockito.mock(Environment.class),
191-
ClusterServiceUtils.createClusterService(threadPool),
190+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
192191
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
193192
Mockito.mock(ResourceWatcherService.class),
194193
() -> null

‎modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
import org.elasticsearch.common.unit.ByteSizeUnit;
2424
import org.elasticsearch.common.unit.ByteSizeValue;
2525
import org.elasticsearch.common.util.MockBigArrays;
26+
import org.elasticsearch.common.util.concurrent.DeterministicTaskQueue;
2627
import org.elasticsearch.env.Environment;
2728
import org.elasticsearch.indices.recovery.RecoverySettings;
2829
import org.elasticsearch.repositories.RepositoryException;
2930
import org.elasticsearch.repositories.blobstore.BlobStoreTestUtil;
3031
import org.elasticsearch.test.ClusterServiceUtils;
3132
import org.elasticsearch.test.ESTestCase;
32-
import org.elasticsearch.threadpool.TestThreadPool;
3333
import org.elasticsearch.watcher.ResourceWatcherService;
3434
import org.elasticsearch.xcontent.NamedXContentRegistry;
3535
import org.hamcrest.Matchers;
@@ -46,20 +46,6 @@
4646

4747
public class S3RepositoryTests extends ESTestCase {
4848

49-
private TestThreadPool threadPool;
50-
51-
@Override
52-
public void setUp() throws Exception {
53-
super.setUp();
54-
threadPool = new TestThreadPool(getTestName());
55-
}
56-
57-
@Override
58-
public void tearDown() throws Exception {
59-
super.tearDown();
60-
threadPool.close();
61-
}
62-
6349
private static class DummyS3Client implements S3Client {
6450

6551
@Override
@@ -185,7 +171,7 @@ private S3Repository createS3Repo(RepositoryMetadata metadata) {
185171
NamedXContentRegistry.EMPTY,
186172
new DummyS3Service(
187173
mock(Environment.class),
188-
ClusterServiceUtils.createClusterService(threadPool),
174+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
189175
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
190176
mock(ResourceWatcherService.class)
191177
),

‎modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3ServiceTests.java‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
import org.elasticsearch.cluster.project.TestProjectResolvers;
2424
import org.elasticsearch.common.Strings;
2525
import org.elasticsearch.common.settings.Settings;
26+
import org.elasticsearch.common.util.concurrent.DeterministicTaskQueue;
2627
import org.elasticsearch.env.Environment;
2728
import org.elasticsearch.rest.RestStatus;
2829
import org.elasticsearch.test.ClusterServiceUtils;
2930
import org.elasticsearch.test.ESTestCase;
3031
import org.elasticsearch.test.MockLog;
3132
import org.elasticsearch.test.junit.annotations.TestLogging;
32-
import org.elasticsearch.threadpool.TestThreadPool;
3333
import org.elasticsearch.watcher.ResourceWatcherService;
3434

3535
import java.io.IOException;
@@ -41,24 +41,10 @@
4141

4242
public class S3ServiceTests extends ESTestCase {
4343

44-
private TestThreadPool threadPool;
45-
46-
@Override
47-
public void setUp() throws Exception {
48-
super.setUp();
49-
threadPool = new TestThreadPool(getTestName());
50-
}
51-
52-
@Override
53-
public void tearDown() throws Exception {
54-
super.tearDown();
55-
threadPool.close();
56-
}
57-
5844
public void testCachedClientsAreReleased() throws IOException {
5945
final S3Service s3Service = new S3Service(
6046
mock(Environment.class),
61-
ClusterServiceUtils.createClusterService(threadPool),
47+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
6248
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
6349
mock(ResourceWatcherService.class),
6450
() -> Region.of("es-test-region")
@@ -115,7 +101,7 @@ public void testGetClientRegionFromSetting() {
115101
try (
116102
var s3Service = new S3Service(
117103
mock(Environment.class),
118-
ClusterServiceUtils.createClusterService(threadPool),
104+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
119105
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
120106
mock(ResourceWatcherService.class),
121107
() -> {
@@ -153,7 +139,7 @@ public void testGetClientRegionFromEndpointSettingGuess() {
153139
try (
154140
var s3Service = new S3Service(
155141
mock(Environment.class),
156-
ClusterServiceUtils.createClusterService(threadPool),
142+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
157143
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
158144
mock(ResourceWatcherService.class),
159145
() -> {
@@ -211,7 +197,7 @@ public void testGetClientRegionFromDefault() {
211197
try (
212198
var s3Service = new S3Service(
213199
mock(Environment.class),
214-
ClusterServiceUtils.createClusterService(threadPool),
200+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
215201
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
216202
mock(ResourceWatcherService.class),
217203
() -> {
@@ -246,7 +232,7 @@ public void testGetClientRegionFallbackToUsEast1() {
246232
try (
247233
var s3Service = new S3Service(
248234
mock(Environment.class),
249-
ClusterServiceUtils.createClusterService(threadPool),
235+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
250236
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
251237
mock(ResourceWatcherService.class),
252238
() -> {
@@ -317,7 +303,7 @@ public void testEndpointOverrideSchemeUsesHttpIfHttpProtocolSpecified() {
317303
private URI getEndpointUri(Settings.Builder settings, String clientName) {
318304
return new S3Service(
319305
mock(Environment.class),
320-
ClusterServiceUtils.createClusterService(threadPool),
306+
ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool()),
321307
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
322308
mock(ResourceWatcherService.class),
323309
() -> Region.of(randomIdentifier())

0 commit comments

Comments
 (0)