Make backup grooming function in the local bootstrap case. (#1071) (#…

…1074)
Netflix · Sep 24, 2023 · a763465 · a763465
1 parent a21dfbe
commit a763465
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/priam/src/main/java/com/netflix/priam/backupv2/BackupTTLTask.java b/priam/src/main/java/com/netflix/priam/backupv2/BackupTTLTask.java
@@ -28,6 +28,7 @@
 import com.netflix.priam.utils.DateUtil;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -76,8 +77,8 @@ public BackupTTLTask(
             @Named("v2") IMetaProxy metaProxy,
             IFileSystemContext backupFileSystemCtx,
             Provider<AbstractBackupPath> abstractBackupPathProvider,
-            InstanceState instanceState,
-            TokenRetriever tokenRetriever)
+            TokenRetriever tokenRetriever,
+            InstanceState instanceState)
             throws Exception {
         super(configuration);
         this.backupRestoreConfig = backupRestoreConfig;
@@ -86,9 +87,11 @@ public BackupTTLTask(
         this.abstractBackupPathProvider = abstractBackupPathProvider;
         this.instanceState = instanceState;
         this.maxWaitMillis =
-                1_000
-                        * backupRestoreConfig.getBackupTTLMonitorPeriodInSec()
-                        / tokenRetriever.getRingPosition().getDenominator();
+                configuration.isLocalBootstrapEnabled()
+                        ? Math.toIntExact(Duration.ofSeconds(1).toMillis())
+                        : 1_000
+                                * backupRestoreConfig.getBackupTTLMonitorPeriodInSec()
+                                / tokenRetriever.getRingPosition().getDenominator();
     }
 
     @Override

diff --git a/priam/src/main/java/com/netflix/priam/backupv2/BackupV2Service.java b/priam/src/main/java/com/netflix/priam/backupv2/BackupV2Service.java
@@ -26,6 +26,7 @@
 import com.netflix.priam.scheduler.TaskTimer;
 import com.netflix.priam.tuner.CassandraTunerService;
 import javax.inject.Inject;
+import org.apache.commons.lang3.math.Fraction;
 
 /**
  * Encapsulate the backup service 2.0 - Execute all the tasks required to run backup service.
@@ -76,10 +77,13 @@ public void scheduleService() throws Exception {
         } else {
             scheduler.deleteTask(BackupVerificationTask.JOBNAME);
         }
-
         // Schedule the TTL service
-        TaskTimer timer =
-                BackupTTLTask.getTimer(backupRestoreConfig, tokenRetriever.getRingPosition());
+        // We cannot get the ring position in a local bootstrap scenario
+        Fraction ringPosition =
+                configuration.isLocalBootstrapEnabled()
+                        ? Fraction.ONE_HALF
+                        : tokenRetriever.getRingPosition();
+        TaskTimer timer = BackupTTLTask.getTimer(backupRestoreConfig, ringPosition);
         scheduleTask(scheduler, BackupTTLTask.class, timer);
 
         // Start the Incremental backup schedule if enabled