Skip to content

Fix flakey test testOverflowDisabledAsynchronous #18891

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
andrross merged 5 commits into from
Aug 2, 2025
+6 −7
Merged

Fix flakey test testOverflowDisabledAsynchronous #18891

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
3a0dc16
fix test testOverflowDisabledAsynchronous
guojialiang92 Aug 1, 2025
a7f6100
fix test testOverflowDisabledAsynchronous
guojialiang92 Aug 1, 2025
e9af8db
remove Thread.sleep
guojialiang92 Aug 1, 2025
51dd56c
make fetchBlobAsync return future
guojialiang92 Aug 1, 2025
89cb38e
remove the redundant test logic in asyncFetchBlobWithName .
guojialiang92 Aug 2, 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
4 changes: 2 additions & 2 deletions server/src/main/java/org/opensearch/index/store/remote/utils/TransferManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public IndexInput fetchBlob(BlobFetchRequest blobFetchRequest) throws IOExceptio
}

@ExperimentalApi
public void fetchBlobAsync(BlobFetchRequest blobFetchRequest) throws IOException {
public CompletableFuture<IndexInput> fetchBlobAsync(BlobFetchRequest blobFetchRequest) throws IOException {
final Path key = blobFetchRequest.getFilePath();
logger.trace("Asynchronous fetchBlob called for {}", key.toString());
try {
Expand All @@ -133,7 +133,7 @@ public void fetchBlobAsync(BlobFetchRequest blobFetchRequest) throws IOException
// decrement this reference _after_ creating the clone to be returned.
// Making sure remote recovery thread-pool take care of background download
try {
cacheEntry.asyncLoadIndexInput(threadPool.executor(ThreadPool.Names.REMOTE_RECOVERY));
return cacheEntry.asyncLoadIndexInput(threadPool.executor(ThreadPool.Names.REMOTE_RECOVERY));
} catch (Exception exception) {
fileCache.decRef(key);
throw exception;
Expand Down
9 changes: 4 additions & 5 deletions server/src/test/java/org/opensearch/index/store/remote/utils/TransferManagerTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
Expand Down Expand Up @@ -313,14 +314,14 @@ public void testAsyncFetchesToDifferentBlobsDoNotBlockOnEachOther() throws Excep
executor.shutdownNow();
}

public void testRefCount() throws IOException, InterruptedException {
public void testRefCount() throws Exception {
List<BlobFetchRequest.BlobPart> blobParts = new ArrayList<>();
String blobname = "test-blob";
blobParts.add(new BlobFetchRequest.BlobPart("blob", 0, EIGHT_MB));
BlobFetchRequest blobFetchRequest = BlobFetchRequest.builder().fileName(blobname).directory(directory).blobParts(blobParts).build();
// It will trigger async load
transferManager.fetchBlobAsync(blobFetchRequest);
Thread.sleep(2000);
CompletableFuture<IndexInput> future = transferManager.fetchBlobAsync(blobFetchRequest);
future.get();
assertEquals(Optional.of(0), Optional.of(fileCache.getRef(blobFetchRequest.getFilePath())));
assertNotNull(fileCache.get(blobFetchRequest.getFilePath()));
fileCache.decRef(blobFetchRequest.getFilePath());
Expand All @@ -347,8 +348,6 @@ private IndexInput asyncFetchBlobWithName(String blobname) throws IOException {
BlobFetchRequest blobFetchRequest = BlobFetchRequest.builder().fileName(blobname).directory(directory).blobParts(blobParts).build();
// It will trigger async load
transferManager.fetchBlobAsync(blobFetchRequest);
assertNotNull(fileCache.get(blobFetchRequest.getFilePath()));
fileCache.decRef(blobFetchRequest.getFilePath());
// Making the read call to fetch from file cache
return transferManager.fetchBlob(blobFetchRequest);
}
Expand Down
Loading