diff --git a/build/lib/pgBackRestBuild/Config/BuildDefine.pm b/build/lib/pgBackRestBuild/Config/BuildDefine.pm index c29d47d1c..302451ec4 100644 --- a/build/lib/pgBackRestBuild/Config/BuildDefine.pm +++ b/build/lib/pgBackRestBuild/Config/BuildDefine.pm @@ -293,6 +293,17 @@ sub renderOptional $bSingleLine = true; } + + if ($bCommand && defined($rhOptional->{&CFGDEF_INTERNAL})) + { + $strBuildSourceOptional .= + (defined($strBuildSourceOptional) && !$bSingleLine ? "\n" : '') . + "${strIndent} CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(" . ($rhOptional->{&CFGDEF_INTERNAL} ? 'true' : 'false') . + ")\n"; + + $bSingleLine = true; + } + if ($bCommand && defined($rhOptional->{&CFGDEF_REQUIRED})) { $strBuildSourceOptional .= diff --git a/build/lib/pgBackRestBuild/Config/Data.pm b/build/lib/pgBackRestBuild/Config/Data.pm index 145e38149..ae41b2409 100644 --- a/build/lib/pgBackRestBuild/Config/Data.pm +++ b/build/lib/pgBackRestBuild/Config/Data.pm @@ -5,6 +5,9 @@ # settings, types, ranges, whether the option is negatable, whether it has dependencies, etc. The initial section is the global # section meaning the defines defined there apply to all commands listed for the option. # +# CFGDEF_INHERIT: +# Inherit all definitions for the referenced option. Any definitions can be overridden. +# # CFGDEF_COMMAND: # List of commands the option can be used with this option. An empty hash signifies that the command does not deviate from the # option defaults. Otherwise, overrides can be specified. @@ -1236,15 +1239,25 @@ my %hConfigDefine = &CFGDEF_INTERNAL => true, }, &CFGCMD_CHECK => {}, + &CFGCMD_EXPIRE => + { + &CFGDEF_INTERNAL => true, + }, &CFGCMD_INFO => {}, &CFGCMD_LOCAL => {}, &CFGCMD_RESTORE => {}, - &CFGCMD_STANZA_CREATE => {}, + &CFGCMD_STANZA_CREATE => + { + &CFGDEF_INTERNAL => true, + }, &CFGCMD_STANZA_DELETE => { &CFGDEF_INTERNAL => true, }, - &CFGCMD_STANZA_UPGRADE => {}, + &CFGCMD_STANZA_UPGRADE => + { + &CFGDEF_INTERNAL => true, + }, &CFGCMD_START => {}, &CFGCMD_STOP => {}, }, @@ -1261,7 +1274,17 @@ my %hConfigDefine = { 'backup-cmd' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_COMMAND => + { + &CFGCMD_ARCHIVE_GET => {}, + &CFGCMD_ARCHIVE_PUSH => {}, + &CFGCMD_CHECK => {}, + &CFGCMD_INFO => {}, + &CFGCMD_LOCAL => {}, + &CFGCMD_RESTORE => {}, + &CFGCMD_START => {}, + &CFGCMD_STOP => {}, + }, &CFGDEF_DEPEND => { &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_HOST @@ -1279,7 +1302,7 @@ my %hConfigDefine = { 'backup-config' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_COMMAND => CFGOPT_REPO_HOST_CMD, &CFGDEF_DEPEND => { &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_HOST @@ -1297,7 +1320,7 @@ my %hConfigDefine = { 'backup-ssh-port' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_COMMAND => CFGOPT_REPO_HOST_CMD, &CFGDEF_DEPEND => { &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_HOST @@ -1315,7 +1338,7 @@ my %hConfigDefine = { 'backup-user' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_COMMAND => CFGOPT_REPO_HOST_CMD, &CFGDEF_REQUIRED => false, &CFGDEF_DEPEND => { @@ -1334,23 +1357,7 @@ my %hConfigDefine = { 'repo-path' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => - { - &CFGCMD_ARCHIVE_GET => {}, - &CFGCMD_ARCHIVE_PUSH => {}, - &CFGCMD_BACKUP => {}, - &CFGCMD_CHECK => {}, - &CFGCMD_EXPIRE => {}, - &CFGCMD_INFO => {}, - &CFGCMD_LOCAL => {}, - &CFGCMD_REMOTE => {}, - &CFGCMD_RESTORE => {}, - &CFGCMD_STANZA_CREATE => {}, - &CFGCMD_STANZA_DELETE => {}, - &CFGCMD_STANZA_UPGRADE => {}, - &CFGCMD_START => {}, - &CFGCMD_STOP => {}, - }, + &CFGDEF_COMMAND => CFGOPT_REPO_TYPE, }, &CFGOPT_REPO_S3_BUCKET => @@ -1875,9 +1882,46 @@ my %hConfigDefine = # Stanza options #------------------------------------------------------------------------------------------------------------------------------- + &CFGOPT_PG_HOST => + { + &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, + &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, + &CFGDEF_REQUIRED => false, + &CFGDEF_NAME_ALT => + { + 'db-host' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + 'db?-host' => {&CFGDEF_NEGATE => false}, + }, + &CFGDEF_COMMAND => + { + &CFGCMD_ARCHIVE_GET => + { + &CFGDEF_INTERNAL => true, + }, + &CFGCMD_ARCHIVE_PUSH => + { + &CFGDEF_INTERNAL => true, + }, + &CFGCMD_BACKUP => {}, + &CFGCMD_CHECK => {}, + &CFGCMD_EXPIRE => {}, + &CFGCMD_LOCAL => {}, + &CFGCMD_RESTORE => + { + &CFGDEF_INTERNAL => true, + }, + &CFGCMD_STANZA_CREATE => {}, + &CFGCMD_STANZA_DELETE => {}, + &CFGCMD_STANZA_UPGRADE => {}, + &CFGCMD_START => {}, + &CFGCMD_STOP => {}, + }, + }, + &CFGOPT_PG_HOST_CMD => { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, &CFGDEF_REQUIRED => false, @@ -1906,61 +1950,38 @@ my %hConfigDefine = &CFGOPT_PG_HOST_CONFIG => { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, - &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, + &CFGDEF_INHERIT => CFGOPT_PG_HOST_CMD, &CFGDEF_DEFAULT => CFGDEF_DEFAULT_CONFIG, + &CFGDEF_REQUIRED => true, &CFGDEF_NAME_ALT => { 'db-config' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, 'db?-config' => {&CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => - { - &CFGCMD_BACKUP => {}, - &CFGCMD_CHECK => {}, - &CFGCMD_EXPIRE => {}, - &CFGCMD_LOCAL => {}, - &CFGCMD_STANZA_CREATE => {}, - &CFGCMD_STANZA_DELETE => {}, - &CFGCMD_STANZA_UPGRADE => {}, - &CFGCMD_START => {}, - &CFGCMD_STOP => {}, - }, - &CFGDEF_DEPEND => - { - &CFGDEF_DEPEND_OPTION => CFGOPT_PG_HOST - }, }, - &CFGOPT_PG_HOST => + &CFGOPT_PG_HOST_PORT => { - &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, - &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, + &CFGDEF_INHERIT => CFGOPT_PG_HOST_CMD, + &CFGDEF_TYPE => CFGDEF_TYPE_INTEGER, &CFGDEF_REQUIRED => false, &CFGDEF_NAME_ALT => { - 'db-host' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, - 'db?-host' => {&CFGDEF_NEGATE => false}, + 'db-ssh-port' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + 'db?-ssh-port' => {&CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => + }, + + &CFGOPT_PG_HOST_USER => + { + &CFGDEF_INHERIT => CFGOPT_PG_HOST_CMD, + &CFGDEF_DEFAULT => 'postgres', + &CFGDEF_NAME_ALT => { - &CFGCMD_ARCHIVE_PUSH => {}, - &CFGCMD_BACKUP => {}, - &CFGCMD_CHECK => {}, - &CFGCMD_EXPIRE => {}, - &CFGCMD_LOCAL => {}, - &CFGCMD_RESTORE => - { - &CFGDEF_INTERNAL => true, - }, - &CFGCMD_STANZA_CREATE => {}, - &CFGCMD_STANZA_DELETE => {}, - &CFGCMD_STANZA_UPGRADE => {}, - &CFGCMD_START => {}, - &CFGCMD_STOP => {}, + 'db-user' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + 'db?-user' => {&CFGDEF_NEGATE => false}, }, + &CFGDEF_REQUIRED => false, }, &CFGOPT_PG_PATH => @@ -2016,79 +2037,29 @@ my %hConfigDefine = { &CFGCMD_BACKUP => {}, &CFGCMD_CHECK => {}, + &CFGCMD_LOCAL => {}, &CFGCMD_REMOTE => {}, &CFGCMD_STANZA_CREATE => {}, &CFGCMD_STANZA_DELETE => {}, &CFGCMD_STANZA_UPGRADE => {}, }, - }, - - &CFGOPT_PG_HOST_PORT => - { - &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, - &CFGDEF_TYPE => CFGDEF_TYPE_INTEGER, - &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, - &CFGDEF_REQUIRED => false, - &CFGDEF_COMMAND => CFGOPT_PG_HOST, - &CFGDEF_NAME_ALT => - { - 'db-ssh-port' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, - 'db?-ssh-port' => {&CFGDEF_NEGATE => false}, - }, &CFGDEF_DEPEND => { - &CFGDEF_DEPEND_OPTION => CFGOPT_PG_HOST + &CFGDEF_DEPEND_OPTION => CFGOPT_PG_PATH }, }, &CFGOPT_PG_SOCKET_PATH => { - &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, - &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, + &CFGDEF_INHERIT => CFGOPT_PG_PORT, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_DEFAULT => undef, &CFGDEF_REQUIRED => false, &CFGDEF_NAME_ALT => { 'db-socket-path' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, 'db?-socket-path' => {&CFGDEF_NEGATE => false}, }, - &CFGDEF_COMMAND => - { - &CFGCMD_BACKUP => {}, - &CFGCMD_CHECK => {}, - &CFGCMD_LOCAL => {}, - &CFGCMD_REMOTE => {}, - &CFGCMD_STANZA_CREATE => {}, - &CFGCMD_STANZA_DELETE => {}, - &CFGCMD_STANZA_UPGRADE => {}, - } - }, - - &CFGOPT_PG_HOST_USER => - { - &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, - &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, - &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_DEFAULT => 'postgres', - &CFGDEF_NAME_ALT => - { - 'db-user' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, - 'db?-user' => {&CFGDEF_NEGATE => false}, - }, - &CFGDEF_COMMAND => - { - &CFGCMD_BACKUP => {}, - &CFGCMD_CHECK => {}, - &CFGCMD_LOCAL => {}, - &CFGCMD_STANZA_CREATE => {}, - &CFGCMD_STANZA_DELETE => {}, - &CFGCMD_STANZA_UPGRADE => {}, - }, - &CFGDEF_REQUIRED => false, - &CFGDEF_DEPEND => - { - &CFGDEF_DEPEND_OPTION => CFGOPT_PG_HOST - }, }, ); diff --git a/doc/xml/release.xml b/doc/xml/release.xml index fc3c1d369..ac6481f20 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -136,6 +136,10 @@

Replace cfgCommandTotal()/cfgOptionTotal() functions with constants. The constants are applicable in more cases and allow the compiler to optimize certain loops more efficiently.

+ +

Cleanup usage of internal options. Apply internal to options that need to be read to determine locality but should not appear in the help.

+ +

Refactor code to make valgrind happy.

 diff --git a/src/command/help/help.c b/src/command/help/help.c index 0eb794de3..0165688cd 100644 --- a/src/command/help/help.c +++ b/src/command/help/help.c @@ -166,7 +166,7 @@ helpRender() for (unsigned int optionDefId = 0; optionDefId < cfgDefOptionTotal(); optionDefId++) { - if (cfgDefOptionValid(commandDefId, optionDefId) && !cfgDefOptionInternal(optionDefId)) + if (cfgDefOptionValid(commandDefId, optionDefId) && !cfgDefOptionInternal(commandDefId, optionDefId)) { String *section = NULL; diff --git a/src/config/define.auto.c b/src/config/define.auto.c index 0b52d00b0..65a60b0fe 100644 --- a/src/config/define.auto.c +++ b/src/config/define.auto.c @@ -1677,6 +1677,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_COMMAND_LIST ( + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchiveGet) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) @@ -1694,6 +1695,27 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-host") + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdArchiveGet) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdArchivePush) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdRestore) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) ) ) @@ -1702,7 +1724,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_NAME("pg-host-cmd") CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) CFGDEFDATA_OPTION_INTERNAL(false) @@ -1744,7 +1766,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_NAME("pg-host-config") CFGDEFDATA_OPTION_REQUIRED(true) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) CFGDEFDATA_OPTION_INTERNAL(false) @@ -1804,12 +1826,10 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_COMMAND_LIST ( - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdExpire) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) @@ -1850,10 +1870,13 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdExpire) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) ) CFGDEFDATA_OPTION_OPTIONAL_LIST @@ -1964,6 +1987,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRemote) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) @@ -1972,6 +1996,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_OPTIONAL_LIST ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptPgPath) CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("5432") CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-port") @@ -2013,6 +2038,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_OPTIONAL_LIST ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptPgPath) CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-socket-path") ) @@ -2348,6 +2374,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdExpire) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdInfo) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) @@ -2362,6 +2389,41 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("backup-host") + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdBackup) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdExpire) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdStanzaCreate) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdStanzaDelete) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdStanzaUpgrade) + + CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(true) + ) ) ) @@ -2390,14 +2452,10 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchiveGet) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdInfo) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) ) @@ -2435,14 +2493,10 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchiveGet) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdInfo) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) ) @@ -2480,14 +2534,10 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchiveGet) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdInfo) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) ) @@ -2527,14 +2577,10 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchiveGet) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdInfo) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) ) diff --git a/src/config/define.c b/src/config/define.c index a2f1065b8..d14ad10dc 100644 --- a/src/config/define.c +++ b/src/config/define.c @@ -100,6 +100,7 @@ typedef enum configDefDataTypeCommand, configDefDataTypeDefault, configDefDataTypeDepend, + configDefDataTypeInternal, configDefDataTypePrefix, configDefDataTypeRequired, configDefDataTypeHelpNameAlt, @@ -150,6 +151,9 @@ typedef enum #define CFGDEFDATA_OPTION_OPTIONAL_COMMAND(command) \ CFGDATA_OPTION_OPTIONAL_PUSH(configDefDataTypeCommand, 0, command), +#define CFGDEFDATA_OPTION_OPTIONAL_INTERNAL(commandOptionInternal) \ + CFGDATA_OPTION_OPTIONAL_PUSH(configDefDataTypeInternal, 0, commandOptionInternal), + #define CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(commandOptionRequired) \ CFGDATA_OPTION_OPTIONAL_PUSH(configDefDataTypeRequired, 0, commandOptionRequired), @@ -555,9 +559,15 @@ cfgDefOptionIndexTotal(ConfigDefineOption optionDefId) Is the option for internal use only? ***********************************************************************************************************************************/ bool -cfgDefOptionInternal(ConfigDefineOption optionDefId) +cfgDefOptionInternal(ConfigDefineCommand commandDefId, ConfigDefineOption optionDefId) { - cfgDefOptionCheck(optionDefId); + cfgDefCommandOptionCheck(commandDefId, optionDefId); + + CONFIG_DEFINE_DATA_FIND(commandDefId, optionDefId, configDefDataTypeInternal); + + if (dataDefFound) + return (bool)dataDef; + return configDefineOptionData[optionDefId].internal; } diff --git a/src/config/define.h b/src/config/define.h index f70afc1de..df3712015 100644 --- a/src/config/define.h +++ b/src/config/define.h @@ -52,7 +52,7 @@ const char *cfgDefOptionHelpSection(ConfigDefineOption optionDefId); const char *cfgDefOptionHelpSummary(ConfigDefineCommand commandDefId, ConfigDefineOption optionDefId); int cfgDefOptionId(const char *optionName); int cfgDefOptionIndexTotal(ConfigDefineOption optionDefId); -bool cfgDefOptionInternal(ConfigDefineOption optionDefId); +bool cfgDefOptionInternal(ConfigDefineCommand commandDefId, ConfigDefineOption optionDefId); const char *cfgDefOptionName(ConfigDefineOption optionDefId); bool cfgDefOptionNegate(ConfigDefineOption optionDefId); const char *cfgDefOptionPrefix(ConfigDefineOption optionDefId); diff --git a/test/expect/mock-all-002.log b/test/expect/mock-all-002.log index 3e928a41a..32d5022d9 100644 --- a/test/expect/mock-all-002.log +++ b/test/expect/mock-all-002.log @@ -164,8 +164,8 @@ P00 DEBUG: Protocol::Local::Process->queueJob(): iHostConfigIdx = 1, rParam P00 DEBUG: Protocol::Local::Process->queueJob(): iHostConfigIdx = 1, rParam = ([TEST_PATH]/db-master/db/base/base/1/PG_VERSION, pg_data/base/1/PG_VERSION, 3, [undef], 0, [BACKUP-FULL-1], 0, 3, [MODIFICATION-TIME-1], 1, [undef]), rParamSecure = [undef], strKey = pg_data/base/1/PG_VERSION, strOp = backupFile, strQueue = pg_data P00 DEBUG: Protocol::Local::Process->queueJob(): iHostConfigIdx = 1, rParam = ([TEST_PATH]/db-master/db/base/PG_VERSION, pg_data/PG_VERSION, 3, [undef], 0, [BACKUP-FULL-1], 0, 3, [MODIFICATION-TIME-1], 1, [undef]), rParamSecure = [undef], strKey = pg_data/PG_VERSION, strOp = backupFile, strQueue = pg_data P00 DEBUG: Protocol::Local::Process->hostConnect: start local process: iHostConfigIdx = 1, iHostIdx = 0, iHostProcessIdx = 0, iProcessId = 1, strHostType = db -P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --buffer-size=16384 --cmd-ssh=/usr/bin/ssh --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=1 --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --pg1-path=[TEST_PATH]/db-master/db/base --pg1-socket-path==/test_socket_path --process=1 --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 2, strCommand = [BACKREST-BIN] --buffer-size=16384 --cmd-ssh=/usr/bin/ssh --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=1 --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --pg1-path=[TEST_PATH]/db-master/db/base --pg1-socket-path==/test_socket_path --process=1 --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --type=db local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --buffer-size=16384 --cmd-ssh=/usr/bin/ssh --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=1 --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --pg1-path=[TEST_PATH]/db-master/db/base --pg1-port=9999 --pg1-socket-path==/test_socket_path --process=1 --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 2, strCommand = [BACKREST-BIN] --buffer-size=16384 --cmd-ssh=/usr/bin/ssh --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=1 --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --pg1-path=[TEST_PATH]/db-master/db/base --pg1-port=9999 --pg1-socket-path==/test_socket_path --process=1 --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --type=db local, strId = local-1 process, strName = local P00 DEBUG: Protocol::Local::Process->hostConnect=>: bResult = true P00 DEBUG: Protocol::Local::Process->init: init local process: iDirection = 1, iHostIdx = 0, iProcessId = 1, iQueueIdx = 0, iQueueLastIdx = 0 P00 DEBUG: Protocol::Local::Process->init=>: bResult = true @@ -282,7 +282,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/backup/repo/backup/db P00 DEBUG: Storage::Local->pathSync(): bRecurse = , strPathExp = P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --buffer-size=16384 --cmd-ssh=/usr/bin/ssh --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --buffer-size=16384 --cmd-ssh=/usr/bin/ssh --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/backup/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/backup/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -1118,7 +1118,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/backup/repo/backup/db P00 DEBUG: Storage::Local->pathSync(): bRecurse = , strPathExp = P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/backup/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/backup/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -1886,7 +1886,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/backup/repo/backup/db P00 DEBUG: Storage::Local->pathSync(): bRecurse = , strPathExp = P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/backup/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/backup/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -2268,7 +2268,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/backup/repo/backup/db P00 DEBUG: Storage::Local->pathSync(): bRecurse = , strPathExp = P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/backup/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/backup/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -2492,7 +2492,7 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base/pg P00 INFO: diff backup size = 25B P00 INFO: new backup label = [BACKUP-DIFF-1] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -2674,7 +2674,7 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base/pg P00 INFO: diff backup size = 25B P00 INFO: new backup label = [BACKUP-DIFF-2] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -2933,7 +2933,7 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ P00 INFO: incr backup size = 13B P00 INFO: new backup label = [BACKUP-INCR-3] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -3153,7 +3153,7 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ P00 INFO: incr backup size = 8B P00 INFO: new backup label = [BACKUP-INCR-4] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -3338,7 +3338,7 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ P00 INFO: diff backup size = 39B P00 INFO: new backup label = [BACKUP-DIFF-3] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -3517,7 +3517,7 @@ P00 TEST: PgBaCkReStTeSt-MANIFEST-BUILD-PgBaCkReStTeSt P00 INFO: incr backup size = 0B P00 INFO: new backup label = [BACKUP-INCR-5] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -3704,7 +3704,7 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ P00 INFO: diff backup size = 31B P00 INFO: new backup label = [BACKUP-DIFF-4] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -3895,7 +3895,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base-2/pg_tblspc/2/[T P00 INFO: full backup size = 144KB P00 INFO: new backup label = [BACKUP-FULL-3] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -4409,7 +4409,7 @@ info db stanza - normal output (backup host) expire full=1 (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --retention-full=1 --stanza=db expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --retention-full=1 --stanza=db P00 INFO: expire full backup set: [BACKUP-FULL-2], [BACKUP-DIFF-2], [BACKUP-INCR-3], [BACKUP-INCR-4], [BACKUP-DIFF-3], [BACKUP-INCR-5], [BACKUP-DIFF-4] P00 INFO: remove expired backup [BACKUP-DIFF-4] P00 INFO: remove expired backup [BACKUP-INCR-5] @@ -4446,7 +4446,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base-2/base/base2.txt P00 INFO: diff backup size = 9B P00 INFO: new backup label = [BACKUP-DIFF-5] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -4898,7 +4898,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base-2/base/base/base P00 INFO: diff backup size = 9B P00 INFO: new backup label = [BACKUP-DIFF-6] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -5074,7 +5074,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base-2/base/base/base P00 INFO: diff backup size = 9B P00 INFO: new backup label = [BACKUP-DIFF-7] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully diff --git a/test/expect/mock-all-003.log b/test/expect/mock-all-003.log index d69aadae1..81b0025f4 100644 --- a/test/expect/mock-all-003.log +++ b/test/expect/mock-all-003.log @@ -2781,7 +2781,7 @@ info db stanza - normal output (backup host) expire full=1 (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=detail --retention-full=1 --stanza=db expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/ --repo1-s3-bucket=pgbackrest-dev --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/ --repo1-s3-bucket=pgbackrest-dev --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --retention-full=1 --stanza=db P00 INFO: expire full backup set: [BACKUP-FULL-2], [BACKUP-DIFF-2], [BACKUP-INCR-3], [BACKUP-INCR-4], [BACKUP-DIFF-3], [BACKUP-INCR-5], [BACKUP-DIFF-4] P00 INFO: remove expired backup [BACKUP-DIFF-4] P00 INFO: remove expired backup [BACKUP-DIFF-3] @@ -3158,7 +3158,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base-2/base/base/base P00 INFO: diff backup size = 9B P00 INFO: new backup label = [BACKUP-DIFF-6] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/ --repo1-s3-bucket=pgbackrest-dev --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/ --repo1-s3-bucket=pgbackrest-dev --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully @@ -3350,7 +3350,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base-2/base/base/base P00 INFO: diff backup size = 9B P00 INFO: new backup label = [BACKUP-DIFF-7] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/ --repo1-s3-bucket=pgbackrest-dev --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/ --repo1-s3-bucket=pgbackrest-dev --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully diff --git a/test/expect/mock-stanza-002.log b/test/expect/mock-stanza-002.log index dcf4738df..3839c8b1e 100644 --- a/test/expect/mock-stanza-002.log +++ b/test/expect/mock-stanza-002.log @@ -438,7 +438,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base/pg_xlog/archive_ P00 INFO: full backup size = 48MB P00 INFO: new backup label = [BACKUP-FULL-1] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --retention-archive=2 --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --retention-archive=2 --retention-full=2 --stanza=db P00 INFO: remove archive path: [TEST_PATH]/backup/repo/archive/db/9.3-1 P00 INFO: full backup total < 2 - using oldest full backup for 9.4-2 archive retention P00 INFO: expire command end: completed successfully @@ -612,7 +612,7 @@ P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base/pg_xlog/archive_ P00 INFO: full backup size = 48MB P00 INFO: new backup label = [BACKUP-FULL-2] P00 INFO: backup command end: completed successfully -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --retention-archive=2 --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --retention-archive=2 --retention-full=2 --stanza=db P00 INFO: remove archive path: [TEST_PATH]/backup/repo/archive/db/10.0-3 P00 INFO: expire command end: completed successfully @@ -793,7 +793,7 @@ db stop db stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-1] --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = P00 DEBUG: Storage::Local->new(): bAllowTemp = , hRule = [undef], lBufferMax = [undef], oDriver = [object], strCipherPassUser = [undef], strCipherType = [undef], strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strPathBase = /, strTempExtension = pgbackrest.tmp P00 DEBUG: Storage::Local->pathCreate(): bCreateParent = true, bIgnoreExists = true, strMode = 770, strPathExp = [TEST_PATH]/backup/lock diff --git a/test/src/module/config/defineTest.c b/test/src/module/config/defineTest.c index 741345c07..303891bb5 100644 --- a/test/src/module/config/defineTest.c +++ b/test/src/module/config/defineTest.c @@ -96,8 +96,9 @@ testRun() TEST_RESULT_INT(cfgDefOptionIndexTotal(cfgDefOptPgPath), 8, "index total > 1"); TEST_RESULT_INT(cfgDefOptionIndexTotal(cfgDefOptRepoPath), 1, "index total == 1"); - TEST_RESULT_BOOL(cfgDefOptionInternal(cfgDefOptSet), false, "option set is not internal"); - TEST_RESULT_BOOL(cfgDefOptionInternal(cfgDefOptTest), true, "option test is internal"); + TEST_RESULT_BOOL(cfgDefOptionInternal(cfgDefCmdRestore, cfgDefOptSet), false, "option set is not internal"); + TEST_RESULT_BOOL(cfgDefOptionInternal(cfgDefCmdRestore, cfgDefOptPgHost), true, "option pg-host is internal"); + TEST_RESULT_BOOL(cfgDefOptionInternal(cfgDefCmdRestore, cfgDefOptTest), true, "option test is internal"); TEST_ERROR(cfgDefOptionNegate(cfgDefOptionTotal()), AssertError, optionIdInvalidHighError); TEST_RESULT_BOOL(cfgDefOptionNegate(cfgDefOptOnline), true, "option can be negated"); diff --git a/test/src/module/config/parseTest.c b/test/src/module/config/parseTest.c index 5d300a027..bd0d88994 100644 --- a/test/src/module/config/parseTest.c +++ b/test/src/module/config/parseTest.c @@ -119,7 +119,7 @@ testRun() strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--repo1-host-user=xxx")); strLstAdd(argList, strNew("--stanza=db")); - strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); + strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); TEST_ERROR( configParse(strLstSize(argList), strLstPtr(argList)), OptionInvalidError, "option 'repo1-host-user' not valid without option 'repo1-host'"); @@ -297,8 +297,6 @@ testRun() argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); strLstAdd(argList, strNew("--stanza=db")); - strLstAdd(argList, strNew("--repo1-host=backup")); - strLstAdd(argList, strNew("--repo1-host-user=pgbackrest")); strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--no-online")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); diff --git a/test/src/module/help/helpTest.c b/test/src/module/help/helpTest.c index 1c53613c0..5ade44db6 100644 --- a/test/src/module/help/helpTest.c +++ b/test/src/module/help/helpTest.c @@ -167,8 +167,6 @@ testRun() "\n" "Stanza Options:\n" "\n" - " --pg-host postgreSQL host for operating remotely via SSH\n" - " --pg-host-port postgreSQL host port when pg-host is set\n" " --pg-path postgreSQL data directory\n" "\n" "Use 'pgbackrest help archive-push [option]' for more information.\n",