diff --git a/java/google/registry/backup/BackupModule.java b/java/google/registry/backup/BackupModule.java index 1ac25645e..12b45d570 100644 --- a/java/google/registry/backup/BackupModule.java +++ b/java/google/registry/backup/BackupModule.java @@ -19,6 +19,7 @@ import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM; import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM; import static google.registry.backup.RestoreCommitLogsAction.FROM_TIME_PARAM; +import static google.registry.backup.RestoreCommitLogsAction.TO_TIME_PARAM; import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter; import static google.registry.request.RequestParameters.extractRequiredParameter; import static java.util.concurrent.Executors.newFixedThreadPool; @@ -80,6 +81,12 @@ public final class BackupModule { return extractRequiredDatetimeParameter(req, FROM_TIME_PARAM); } + @Provides + @Parameter(TO_TIME_PARAM) + static DateTime provideToTime(HttpServletRequest req) { + return extractRequiredDatetimeParameter(req, TO_TIME_PARAM); + } + @Provides @Backups static ListeningExecutorService provideListeningExecutorService() { diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java index 9ebe12c40..e7851d926 100644 --- a/java/google/registry/backup/RestoreCommitLogsAction.java +++ b/java/google/registry/backup/RestoreCommitLogsAction.java @@ -69,10 +69,12 @@ public class RestoreCommitLogsAction implements Runnable { static final String PATH = "/_dr/task/restoreCommitLogs"; static final String DRY_RUN_PARAM = "dryRun"; static final String FROM_TIME_PARAM = "fromTime"; + static final String TO_TIME_PARAM = "toTime"; @Inject GcsService gcsService; @Inject @Parameter(DRY_RUN_PARAM) boolean dryRun; @Inject @Parameter(FROM_TIME_PARAM) DateTime fromTime; + @Inject @Parameter(TO_TIME_PARAM) DateTime toTime; @Inject DatastoreService datastoreService; @Inject GcsDiffFileLister diffLister; @Inject Retrier retrier; @@ -87,7 +89,7 @@ public class RestoreCommitLogsAction implements Runnable { if (dryRun) { logger.info("Running in dryRun mode"); } - List diffFiles = diffLister.listDiffFiles(fromTime, null); + List diffFiles = diffLister.listDiffFiles(fromTime, toTime); if (diffFiles.isEmpty()) { logger.info("Nothing to restore"); return;