Include incremental secondary index files in restore.

Netflix · May 4, 2024 · b429499 · b429499
1 parent c1b751f
commit b429499
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/priam/src/main/java/com/netflix/priam/backupv2/MetaV2Proxy.java b/priam/src/main/java/com/netflix/priam/backupv2/MetaV2Proxy.java
@@ -87,11 +87,16 @@ private String getMatch(
 
     @Override
     public ImmutableList<AbstractBackupPath> getIncrementals(DateUtil.DateRange dateRange) {
-        String incrementalPrefix = getMatch(dateRange, AbstractBackupPath.BackupFileType.SST_V2);
-        String marker =
-                getMatch(
-                        new DateUtil.DateRange(dateRange.getStartTime(), null),
-                        AbstractBackupPath.BackupFileType.SST_V2);
+        return new ImmutableList.Builder<AbstractBackupPath>()
+            .addAll(getIncrementals(dateRange, AbstractBackupPath.BackupFileType.SST_V2))
+            .addAll(getIncrementals(dateRange, AbstractBackupPath.BackupFileType.SECONDARY_INDEX_V2))
+            .build();
+    }
+
+    private ImmutableList<AbstractBackupPath> getIncrementals(
+        DateUtil.DateRange dateRange, AbstractBackupPath.BackupFileType type) {
+        String incrementalPrefix = getMatch(dateRange, type);
+        String marker = getMatch(new DateUtil.DateRange(dateRange.getStartTime(), null), type);
         logger.info(
                 "Listing filesystem with prefix: {}, marker: {}, daterange: {}",
                 incrementalPrefix,

diff --git a/priam/src/test/java/com/netflix/priam/backupv2/TestMetaV2Proxy.java b/priam/src/test/java/com/netflix/priam/backupv2/TestMetaV2Proxy.java
@@ -133,7 +133,16 @@ public void testGetSSTFilesFromMeta() throws Exception {
     @Test
     public void testGetIncrementalFiles() throws Exception {
         DateUtil.DateRange dateRange = new DateUtil.DateRange("202812071820,20281229");
-        Truth.assertThat(metaProxy.getIncrementals(dateRange)).hasSize(3);
+        ImmutableList<AbstractBackupPath> paths = metaProxy.getIncrementals(dateRange);
+        Truth.assertThat(paths).hasSize(4);
+    }
+
+    @Test
+    public void testGetIncrementalFilesIncludesSecondaryIndexes() throws Exception {
+        DateUtil.DateRange dateRange = new DateUtil.DateRange("202812071820,20281229");
+        ImmutableList<AbstractBackupPath> paths = metaProxy.getIncrementals(dateRange);
+        Truth.assertThat(paths.get(3).getType())
+            .isEqualTo(AbstractBackupPath.BackupFileType.SECONDARY_INDEX_V2);
     }
 
     @Test
@@ -223,6 +232,16 @@ private List<String> getRemoteFakeFiles() {
                         "SNAPPY",
                         "PLAINTEXT",
                         "file4-Data.db"));
+        files.add(
+            Paths.get(
+                getPrefix(),
+                AbstractBackupPath.BackupFileType.SECONDARY_INDEX_V2.toString(),
+                "1859828420000",
+                "keyspace1",
+                "columnfamily1",
+                "SNAPPY",
+                "PLAINTEXT",
+                "file5-Data.db"));
         files.add(
                 Paths.get(
                         getPrefix(),