honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CachedBlobContainerIndexInputTests Shutdown (#64181) (#64211) 

Same problem as in #64100 we have to safely wait for all operations to go through to
not leak file handles potentially in this test.
This commit is contained in:
Armin Braun 2020-10-27 14:22:43 +01:00 committed by GitHub
parent 2422f62bab
commit 6f1c8136a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/index/store/SearchableSnapshotDirectoryTests.java
View File

@ -943,14 +943,14 @@ public class SearchableSnapshotDirectoryTests extends ESTestCase {
} }
// Wait for all operations on the threadpool to complete to make sure we don't leak any reference count releasing and then shut it down // Wait for all operations on the threadpool to complete to make sure we don't leak any reference count releasing and then shut it down
private static void terminateSafely(ThreadPool threadPool) throws Exception { public static void terminateSafely(ThreadPool threadPool) throws Exception {
assertBusy(() -> { assertBusy(() -> {
for (ThreadPoolStats.Stats stat : threadPool.stats()) { for (ThreadPoolStats.Stats stat : threadPool.stats()) {
assertEquals(stat.getActive(), 0); assertEquals(stat.getActive(), 0);
assertEquals(stat.getQueue(), 0); assertEquals(stat.getQueue(), 0);
} }
}); });
assertTrue(ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS)); assertTrue(ThreadPool.terminate(threadPool, 30, TimeUnit.SECONDS));
} }
private static class FaultyReadsFileSystem extends FilterFileSystemProvider { private static class FaultyReadsFileSystem extends FilterFileSystemProvider {

10
x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/index/store/cache/CachedBlobContainerIndexInputTests.java vendored
View File

@ -23,6 +23,7 @@ import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.index.shard.ShardPath; import org.elasticsearch.index.shard.ShardPath;
import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot; import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot;
import org.elasticsearch.index.store.SearchableSnapshotDirectory; import org.elasticsearch.index.store.SearchableSnapshotDirectory;
import org.elasticsearch.index.store.SearchableSnapshotDirectoryTests;
import org.elasticsearch.index.store.StoreFileMetadata; import org.elasticsearch.index.store.StoreFileMetadata;
import org.elasticsearch.index.store.cache.TestUtils.NoopBlobStoreCacheService; import org.elasticsearch.index.store.cache.TestUtils.NoopBlobStoreCacheService;
import org.elasticsearch.indices.recovery.RecoveryState; import org.elasticsearch.indices.recovery.RecoveryState;
@ -44,7 +45,6 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.atomic.LongAdder;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.notNullValue;
public class CachedBlobContainerIndexInputTests extends ESIndexInputTestCase { public class CachedBlobContainerIndexInputTests extends ESIndexInputTestCase {
public void testRandomReads() throws IOException { public void testRandomReads() throws Exception {
final ThreadPool threadPool = new TestThreadPool(getTestName(), SearchableSnapshots.executorBuilders()); final ThreadPool threadPool = new TestThreadPool(getTestName(), SearchableSnapshots.executorBuilders());
try (CacheService cacheService = createCacheService(random())) { try (CacheService cacheService = createCacheService(random())) {
cacheService.start(); cacheService.start();
@ -155,11 +155,11 @@ public class CachedBlobContainerIndexInputTests extends ESIndexInputTestCase {
} }
} }
} finally { } finally {
ThreadPool.terminate(threadPool, 30, TimeUnit.SECONDS); SearchableSnapshotDirectoryTests.terminateSafely(threadPool);
} }
} }
public void testThrowsEOFException() throws IOException { public void testThrowsEOFException() throws Exception {
try (CacheService cacheService = createCacheService(random())) { try (CacheService cacheService = createCacheService(random())) {
cacheService.start(); cacheService.start();
@ -223,7 +223,7 @@ public class CachedBlobContainerIndexInputTests extends ESIndexInputTestCase {
} }
} }
} finally { } finally {
terminate(threadPool); SearchableSnapshotDirectoryTests.terminateSafely(threadPool);
} }
} }
} }