From 93357ce97f9c3923c8c366b0ce56fc252dc20fe7 Mon Sep 17 00:00:00 2001 From: Gaurav Bafna Date: Mon, 28 Aug 2023 16:12:34 +0530 Subject: [PATCH] making downloadOnce private Signed-off-by: Gaurav Bafna --- .../java/org/opensearch/index/translog/RemoteFsTranslog.java | 2 +- .../org/opensearch/index/translog/RemoteFsTranslogTests.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java b/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java index 8f64a548f5316..c488127857ed5 100644 --- a/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java +++ b/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java @@ -185,7 +185,7 @@ static void download(TranslogTransferManager translogTransferManager, Path locat throw ex; } - static void downloadOnce(TranslogTransferManager translogTransferManager, Path location, Logger logger) throws IOException { + static private void downloadOnce(TranslogTransferManager translogTransferManager, Path location, Logger logger) throws IOException { logger.trace("Downloading translog files from remote"); RemoteTranslogTransferTracker statsTracker = translogTransferManager.getRemoteTranslogTransferTracker(); long prevDownloadBytesSucceeded = statsTracker.getDownloadBytesSucceeded(); diff --git a/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java b/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java index b99d04400647d..0f89d8b8ee3ba 100644 --- a/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java +++ b/server/src/test/java/org/opensearch/index/translog/RemoteFsTranslogTests.java @@ -61,6 +61,7 @@ import java.io.Closeable; import java.io.EOFException; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; @@ -1491,7 +1492,9 @@ public void testDownloadWithRetries() throws IOException { // File not found in first attempt . File found in second attempt. mockTransfer = mock(TranslogTransferManager.class); - when(mockTransfer.downloadTranslog(any(), any(), any())).thenThrow(new NoSuchFileException("File not found")).thenReturn(true); + String msg = "File not found"; + Exception toThrow = randomBoolean() ? new NoSuchFileException(msg) : new FileNotFoundException(msg); + when(mockTransfer.downloadTranslog(any(), any(), any())).thenThrow(toThrow).thenReturn(true); AtomicLong downloadCounter = new AtomicLong(); doAnswer(invocation -> {