wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix: fdbrestore commands other than "start" were using default cluster file argument handling (but without the -C flag) instead of using the --dest_cluster_file argument.

This commit is contained in:
Stephen Atherton 2019-07-29 13:19:28 -07:00
parent d19be2348a
commit b644f15b87
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdbbackup/backup.actor.cpp
View File

@ -903,7 +903,7 @@ static void printBackupUsage(bool devhelp) {
printf(" -e ERRORLIMIT The maximum number of errors printed by status (default is 10).\n");
printf(" -k KEYS List of key ranges to backup.\n"
" If not specified, the entire database will be backed up.\n");
printf(" -n, --dryrun For start or restore operations, performs a trial run with no actual changes made.\n");
printf(" -n, --dryrun For backup start or restore start, performs a trial run with no actual changes made.\n");
#ifndef TLS_DISABLED
printf(TLS_HELP);
#endif
@ -3386,12 +3386,8 @@ int main(int argc, char* argv[]) {
break;
case EXE_RESTORE:
if(dryRun) {
initTraceFile();
}
else if(restoreType != RESTORE_START && !initCluster()) {
return FDB_EXIT_ERROR;
}
// Must explicitly call trace file options handling because initCluster() is not being used
initTraceFile();
if(restoreClusterFileDest.empty()) {
fprintf(stderr, "Restore destination cluster file must be specified explicitly.\n");