Always TTL backups. (#1038)

Netflix · Apr 15, 2023 · 7247964 · 7247964
1 parent c107cf3
commit 7247964
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/priam/src/main/java/com/netflix/priam/backupv2/BackupV2Service.java b/priam/src/main/java/com/netflix/priam/backupv2/BackupV2Service.java
@@ -68,21 +68,20 @@ public void scheduleService() throws Exception {
             // restart.
             snapshotMetaTask.uploadFiles();
 
-            // Schedule the TTL service
-            TaskTimer timer =
-                    BackupTTLTask.getTimer(backupRestoreConfig, tokenRetriever.getRingPosition());
-            scheduleTask(scheduler, BackupTTLTask.class, timer);
-
             // Schedule the backup verification service
             scheduleTask(
                     scheduler,
                     BackupVerificationTask.class,
                     BackupVerificationTask.getTimer(backupRestoreConfig));
         } else {
-            scheduler.deleteTask(BackupTTLTask.JOBNAME);
             scheduler.deleteTask(BackupVerificationTask.JOBNAME);
         }
 
+        // Schedule the TTL service
+        TaskTimer timer =
+                BackupTTLTask.getTimer(backupRestoreConfig, tokenRetriever.getRingPosition());
+        scheduleTask(scheduler, BackupTTLTask.class, timer);
+
         // Start the Incremental backup schedule if enabled
         scheduleTask(
                 scheduler,

diff --git a/priam/src/test/java/com/netflix/priam/backupv2/TestBackupV2Service.java b/priam/src/test/java/com/netflix/priam/backupv2/TestBackupV2Service.java
@@ -17,6 +17,7 @@
 
 package com.netflix.priam.backupv2;
 
+import com.google.common.truth.Truth;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.netflix.priam.backup.AbstractBackup;
@@ -72,6 +73,8 @@ public void testBackupDisabled(
             {
                 backupRestoreConfig.getSnapshotMetaServiceCronExpression();
                 result = "-1";
+                backupRestoreConfig.getBackupTTLMonitorPeriodInSec();
+                result = 600;
                 configuration.getDataFileLocation();
                 result = "target/data";
             }
@@ -109,7 +112,7 @@ public void testBackupDisabled(
                         cassandraTunerService,
                         tokenRetriever);
         backupService.scheduleService();
-        Assert.assertTrue(scheduler.getScheduler().getJobGroupNames().isEmpty());
+        Truth.assertThat(scheduler.getScheduler().getJobGroupNames()).hasSize(1);
 
         // snapshot V2 name should not be there.
         Set<Path> backupPaths =
@@ -220,6 +223,6 @@ public void updateService(
         Assert.assertEquals(3, scheduler.getScheduler().getJobKeys(null).size());
 
         backupService.onChangeUpdateService();
-        Assert.assertEquals(0, scheduler.getScheduler().getJobKeys(null).size());
+        Assert.assertEquals(1, scheduler.getScheduler().getJobKeys(null).size());
     }
 }