zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 07:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add "toTime" parameter to RestoreCommitLogsAction web form

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=155500640
This commit is contained in:
mmuller 2017-05-09 07:14:00 -07:00 • committed by Ben McIlwain
parent ef1487cb57
commit 70e3271319
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
java/google/registry/backup/BackupModule.java
View file

@ -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() {

4
java/google/registry/backup/RestoreCommitLogsAction.java
View file

@ -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<GcsFileMetadata> diffFiles = diffLister.listDiffFiles(fromTime, null);
List<GcsFileMetadata> diffFiles = diffLister.listDiffFiles(fromTime, toTime);
if (diffFiles.isEmpty()) {
logger.info("Nothing to restore");
return;