diff --git a/build/lib/pgBackRestBuild/Config/Data.pm b/build/lib/pgBackRestBuild/Config/Data.pm index c60966fc4..7f2aa53ba 100644 --- a/build/lib/pgBackRestBuild/Config/Data.pm +++ b/build/lib/pgBackRestBuild/Config/Data.pm @@ -695,18 +695,6 @@ my %hConfigDefine = &CFGDEF_NEGATE => false, }, - &CFGOPT_DELTA => - { - &CFGDEF_TYPE => CFGDEF_TYPE_BOOLEAN, - &CFGDEF_COMMAND => - { - &CFGCMD_RESTORE => - { - &CFGDEF_DEFAULT => false, - } - } - }, - &CFGOPT_FORCE => { &CFGDEF_TYPE => CFGDEF_TYPE_BOOLEAN, @@ -1116,6 +1104,19 @@ my %hConfigDefine = } }, + &CFGOPT_DELTA => + { + &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_TYPE => CFGDEF_TYPE_BOOLEAN, + &CFGDEF_COMMAND => + { + &CFGCMD_RESTORE => + { + &CFGDEF_DEFAULT => false, + } + } + }, + &CFGOPT_COMPRESS => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, diff --git a/doc/xml/reference.xml b/doc/xml/reference.xml index a79d654d5..a2296e0a6 100644 --- a/doc/xml/reference.xml +++ b/doc/xml/reference.xml @@ -677,6 +677,15 @@ db_main + + + Restore using delta. + + By default the data and tablespace directories are expected to be present but empty. This option performs a delta restore using checksums. + + y + + Restore all symlinks. @@ -1030,15 +1039,6 @@ 20150131-153358F_20150131-153401I - - - Restore using delta. - - By default the data and tablespace directories are expected to be present but empty. This option performs a delta restore using checksums. - - y - - Force a restore. diff --git a/doc/xml/release.xml b/doc/xml/release.xml index e1cc22ab5..930d28c21 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -45,6 +45,14 @@ Improve support for special characters in filenames. + + + + + + + Allow delta option to be specified in the configuration file. + diff --git a/src/config/define.auto.c b/src/config/define.auto.c index 7d0e2391c..3552a015f 100644 --- a/src/config/define.auto.c +++ b/src/config/define.auto.c @@ -974,13 +974,21 @@ static ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_NAME("delta") CFGDEFDATA_OPTION_REQUIRED(true) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionCommandLine) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeBoolean) CFGDEFDATA_OPTION_INTERNAL(false) CFGDEFDATA_OPTION_INDEX_TOTAL(1) CFGDEFDATA_OPTION_SECURE(false) + CFGDEFDATA_OPTION_HELP_SECTION("restore") + CFGDEFDATA_OPTION_HELP_SUMMARY("Restore using delta.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "By default the PostgreSQL data and tablespace directories are expected to be present but empty. This option performs " + "a delta restore using checksums." + ) + CFGDEFDATA_OPTION_COMMAND_LIST ( CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) @@ -993,13 +1001,6 @@ static ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdRestore) CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("0") - - CFGDEFDATA_OPTION_OPTIONAL_HELP_SUMMARY("Restore using delta.") - CFGDEFDATA_OPTION_OPTIONAL_HELP_DESCRIPTION - ( - "By default the PostgreSQL data and tablespace directories are expected to be present but empty. This option " - "performs a delta restore using checksums." - ) ) ) ) diff --git a/src/config/parse.auto.c b/src/config/parse.auto.c index 317eb6764..a1e19c843 100644 --- a/src/config/parse.auto.c +++ b/src/config/parse.auto.c @@ -258,6 +258,14 @@ static const struct option optionList[] = .name = "delta", .val = PARSE_OPTION_FLAG | cfgOptDelta, }, + { + .name = "no-delta", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDelta, + }, + { + .name = "reset-delta", + .val = PARSE_OPTION_FLAG | PARSE_RESET_FLAG | cfgOptDelta, + }, // exclude option // -----------------------------------------------------------------------------------------------------------------------------
Improve support for special characters in filenames.
Allow delta option to be specified in the configuration file.