Add more tests

Signed-off-by: Sachin Kale <[email protected]>
sachinpkale · Oct 10, 2024 · cd4c0ad · cd4c0ad
1 parent acf209f
commit cd4c0ad
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java b/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java
@@ -240,6 +240,7 @@ public void onResponse(List<BlobMetadata> blobMetadata) {
                         remoteGenerationDeletionPermits.release();
                     }
                 } catch (Exception e) {
+                    logger.error("Exception in trimUnreferencedReaders", e);
                     remoteGenerationDeletionPermits.release(REMOTE_DELETION_PERMITS);
                 }
             }
@@ -441,7 +442,7 @@ protected static void deleteStaleRemotePrimaryTerms(
         }
         Optional<Long> minPrimaryTermFromMetadataFiles = metadataFilesNotToBeDeleted.stream().map(file -> {
             try {
-                return getMinMaxPrimaryTermFromMetadataFile(file, translogTransferManager, oldFormatMetadataFilePrimaryTermMap).v1();
+                return getMinMaxPrimaryTermFromMetadataFile(file, translogTransferManager, oldFormatMetadataFilePrimaryTermMap, logger).v1();
             } catch (IOException e) {
                 return Long.MIN_VALUE;
             }
@@ -482,7 +483,8 @@ protected static Long getMinPrimaryTermInRemote(
     protected static Tuple<Long, Long> getMinMaxPrimaryTermFromMetadataFile(
         String metadataFile,
         TranslogTransferManager translogTransferManager,
-        Map<String, Tuple<Long, Long>> oldFormatMetadataFilePrimaryTermMap
+        Map<String, Tuple<Long, Long>> oldFormatMetadataFilePrimaryTermMap,
+        Logger logger
     ) throws IOException {
         Tuple<Long, Long> minMaxPrimaryTermFromFileName = TranslogTransferMetadata.getMinMaxPrimaryTermFromFilename(metadataFile);
         if (minMaxPrimaryTermFromFileName != null) {
@@ -504,6 +506,8 @@ protected static Tuple<Long, Long> getMinMaxPrimaryTermFromMetadataFile(
                     if (primaryTerm.isPresent()) {
                         minPrimaryTem = primaryTerm.get();
                     }
+                } else {
+                   logger.warn("No primary term found from GenerationToPrimaryTermMap for file [{}]", metadataFile);
                 }
                 Tuple<Long, Long> minMaxPrimaryTermTuple = new Tuple<>(minPrimaryTem, maxPrimaryTem);
                 oldFormatMetadataFilePrimaryTermMap.put(metadataFile, minMaxPrimaryTermTuple);

diff --git a/server/src/test/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslogTests.java b/server/src/test/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslogTests.java
@@ -1061,31 +1061,32 @@ public void testGetMinMaxTranslogGenerationFromMetadataFile() throws IOException
     public void testGetMinMaxPrimaryTermFromMetadataFile() throws IOException {
         TranslogTransferManager translogTransferManager = mock(TranslogTransferManager.class);
 
-        RemoteFsTimestampAwareTranslog translog = (RemoteFsTimestampAwareTranslog) this.translog;
-
         // Fetch generations directly from the filename
         assertEquals(
             new Tuple<>(1L, 1008L),
             RemoteFsTimestampAwareTranslog.getMinMaxPrimaryTermFromMetadataFile(
                 "metadata__9223372036854774799__9223372036854774799__9223370311919910393__31__9223372036854775106__1__1",
                 translogTransferManager,
-                new HashMap<>()
+                new HashMap<>(),
+                logger
             )
         );
         assertEquals(
             new Tuple<>(4L, 7L),
             RemoteFsTimestampAwareTranslog.getMinMaxPrimaryTermFromMetadataFile(
                 "metadata__9223372036854775800__9223372036854775800__9223370311919910398__31__9223372036854775803__4__1",
                 translogTransferManager,
-                new HashMap<>()
+                new HashMap<>(),
+                logger
             )
         );
         assertEquals(
             new Tuple<>(10L, 10L),
             RemoteFsTimestampAwareTranslog.getMinMaxPrimaryTermFromMetadataFile(
                 "metadata__9223372036854775797__9223372036854775800__9223370311919910398__31__9223372036854775803__10__1",
                 translogTransferManager,
-                new HashMap<>()
+                new HashMap<>(),
+                logger
             )
         );
 
@@ -1099,22 +1100,54 @@ public void testGetMinMaxPrimaryTermFromMetadataFile() throws IOException {
             RemoteFsTimestampAwareTranslog.getMinMaxPrimaryTermFromMetadataFile(
                 "metadata__9223372036854775805__9223372036854774799__9223370311919910393__31__1",
                 translogTransferManager,
-                new HashMap<>()
+                new HashMap<>(),
+                logger
             )
         );
         assertEquals(
             new Tuple<>(4L, 7L),
             RemoteFsTimestampAwareTranslog.getMinMaxPrimaryTermFromMetadataFile(
                 "metadata__9223372036438563903__9223372036854775800__9223370311919910398__31__1",
                 translogTransferManager,
-                Map.of("metadata__9223372036438563903__9223372036854775800__9223370311919910398__31__1", new Tuple<>(4L, 7L))
+                Map.of("metadata__9223372036438563903__9223372036854775800__9223370311919910398__31__1", new Tuple<>(4L, 7L)),
+                logger
             )
         );
 
         verify(translogTransferManager).readMetadata("metadata__9223372036854775805__9223372036854774799__9223370311919910393__31__1");
         verify(translogTransferManager, times(0)).readMetadata(
             "metadata__9223372036438563903__9223372036854775800__9223370311919910398__31__1"
         );
+
+        // Older md files with empty GenerationToPrimaryTermMap
+        md1 = mock(TranslogTransferMetadata.class);
+        when(md1.getGenerationToPrimaryTermMapper()).thenReturn(Map.of());
+        when(translogTransferManager.readMetadata("metadata__9223372036854775805__9223372036854774799__9223370311919910393__31__1"))
+            .thenReturn(md1);
+        assertEquals(
+            new Tuple<>(-1L, 2L),
+            RemoteFsTimestampAwareTranslog.getMinMaxPrimaryTermFromMetadataFile(
+                "metadata__9223372036854775805__9223372036854774799__9223370311919910393__31__1",
+                translogTransferManager,
+                new HashMap<>(),
+                logger
+            )
+        );
+
+        // Older md files with empty GenerationToPrimaryTermMap
+        md1 = mock(TranslogTransferMetadata.class);
+        when(md1.getGenerationToPrimaryTermMapper()).thenReturn(null);
+        when(translogTransferManager.readMetadata("metadata__9223372036854775805__9223372036854774799__9223370311919910393__31__1"))
+            .thenReturn(md1);
+        assertEquals(
+            new Tuple<>(-1L, 2L),
+            RemoteFsTimestampAwareTranslog.getMinMaxPrimaryTermFromMetadataFile(
+                "metadata__9223372036854775805__9223372036854774799__9223370311919910393__31__1",
+                translogTransferManager,
+                new HashMap<>(),
+                logger
+            )
+        );
     }
 
     public void testDeleteStaleRemotePrimaryTerms() throws IOException {