From be900281003f67c549630186482242cc40f0685b Mon Sep 17 00:00:00 2001 From: David Steele Date: Sat, 3 Feb 2018 18:27:38 -0500 Subject: [PATCH] Rename db-* options to pg-* and backup-* options to repo-* to improve consistency. * repo-* options are now indexed although only one is allowed. * List deprecated option names in documentation and command-line help. --- .travis.yml | 2 +- build/lib/pgBackRestBuild/Config/Build.pm | 2 +- .../lib/pgBackRestBuild/Config/BuildDefine.pm | 25 +- .../lib/pgBackRestBuild/Config/BuildParse.pm | 96 +- build/lib/pgBackRestBuild/Config/Data.pm | 545 +++-- doc/lib/BackRestDoc/Common/DocConfig.pm | 39 +- doc/lib/BackRestDoc/Common/DocExecute.pm | 14 +- doc/xml/reference.xml | 148 +- doc/xml/release.xml | 8 + doc/xml/test.xml | 4 +- doc/xml/user-guide.xml | 632 ++--- lib/pgBackRest/Archive/Common.pm | 2 +- lib/pgBackRest/Archive/Get/Get.pm | 4 +- lib/pgBackRest/Archive/Push/Push.pm | 2 +- lib/pgBackRest/Backup/Backup.pm | 12 +- lib/pgBackRest/Check/Check.pm | 8 +- lib/pgBackRest/Config/Config.pm | 28 +- lib/pgBackRest/Db.pm | 30 +- lib/pgBackRest/Main.pm | 7 +- lib/pgBackRest/Manifest.pm | 2 +- lib/pgBackRest/Protocol/Helper.pm | 68 +- lib/pgBackRest/Protocol/Storage/Helper.pm | 2 +- lib/pgBackRest/Restore.pm | 2 +- lib/pgBackRest/Stanza.pm | 2 +- libc/build/lib/pgBackRestLibC/Build.pm | 1 - libc/lib/pgBackRest/LibCAuto.pm | 29 +- libc/xs/config/config.auto.xsh | 28 +- libc/xs/config/define.xs | 17 - src/command/help/help.c | 30 +- src/config/config.auto.c | 1146 ++++----- src/config/config.auto.h | 36 +- src/config/define.auto.c | 1253 +++++----- src/config/define.auto.h | 28 +- src/config/define.c | 75 +- src/config/define.h | 5 +- src/config/load.c | 17 +- src/config/parse.auto.c | 2094 +++++++++++------ src/config/parse.c | 32 +- test/README.md | 4 +- test/Vagrantfile | 20 +- test/expect/archive-stop-001.log | 2 +- test/expect/archive-stop-002.log | 2 +- test/expect/archive-stop-003.log | 2 +- test/expect/archive-stop-004.log | 6 +- test/expect/archive-stop-005.log | 2 +- test/expect/archive-stop-006.log | 6 +- test/expect/archive-stop-007.log | 6 +- test/expect/expire-expire-001.log | 24 +- test/expect/expire-expire-002.log | 10 +- test/expect/mock-all-001.log | 246 +- test/expect/mock-all-002.log | 558 ++--- test/expect/mock-all-003.log | 618 ++--- test/expect/mock-archive-001.log | 42 +- test/expect/mock-archive-002.log | 54 +- test/expect/mock-archive-003.log | 2 +- test/expect/mock-stanza-001.log | 64 +- test/expect/mock-stanza-002.log | 114 +- test/expect/mock-stanza-003.log | 90 +- test/expect/real-all-001.log | 28 +- test/expect/real-all-002.log | 128 +- test/expect/real-all-003.log | 128 +- test/expect/real-all-004.log | 98 +- test/expect/real-all-005.log | 194 +- test/expect/real-all-006.log | 88 +- test/expect/real-help-001.log | 50 +- .../pgBackRestTest/Common/ContainerTest.pm | 2 +- test/lib/pgBackRestTest/Common/DefineTest.pm | 2 +- test/lib/pgBackRestTest/Common/JobTest.pm | 2 +- test/lib/pgBackRestTest/Common/LogTest.pm | 2 +- test/lib/pgBackRestTest/Env/ExpireEnvTest.pm | 8 +- .../pgBackRestTest/Env/Host/HostBackupTest.pm | 104 +- .../Env/Host/HostDbCommonTest.pm | 2 +- .../lib/pgBackRestTest/Env/Host/HostDbTest.pm | 9 - test/lib/pgBackRestTest/Env/HostEnvTest.pm | 2 +- .../Module/Archive/ArchiveCommonTest.pm | 16 +- .../Module/Archive/ArchiveGetTest.pm | 2 +- .../Module/Archive/ArchivePushPerlTest.pm | 22 +- .../Module/Expire/ExpireExpireTest.pm | 4 +- .../Module/Info/InfoUnitTest.pm | 10 +- .../Module/Manifest/ManifestAllTest.pm | 2 +- .../pgBackRestTest/Module/Mock/MockAllTest.pm | 8 +- .../Module/Performance/PerformanceIoTest.pm | 6 +- .../Module/Protocol/ProtocolHelperTest.pm | 28 +- .../pgBackRestTest/Module/Real/RealAllTest.pm | 34 +- .../Module/Real/RealHelpTest.pm | 2 +- .../Module/Stanza/StanzaAllTest.pm | 2 +- .../Module/Storage/StorageHelperPerlTest.pm | 2 +- test/src/module/command/commandTest.c | 12 +- test/src/module/common/iniTest.c | 8 +- test/src/module/config/configTest.c | 28 +- test/src/module/config/defineTest.c | 33 +- test/src/module/config/loadTest.c | 31 +- test/src/module/config/parseTest.c | 146 +- test/src/module/help/helpTest.c | 48 +- test/src/module/perl/execTest.c | 1 - test/test.pl | 14 +- 96 files changed, 5383 insertions(+), 4270 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7c09d13e..d1aa86208 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: install: - | # User Configuration - sudo adduser --ingroup=${USER?} --disabled-password --gecos "" backrest + sudo adduser --ingroup=${USER?} --disabled-password --gecos "" pgbackrest umask 0022 cd ~ && pwd && whoami && umask && groups mv ${TRAVIS_BUILD_DIR?} pgbackrest diff --git a/build/lib/pgBackRestBuild/Config/Build.pm b/build/lib/pgBackRestBuild/Config/Build.pm index aaf7cc337..244ac4de6 100644 --- a/build/lib/pgBackRestBuild/Config/Build.pm +++ b/build/lib/pgBackRestBuild/Config/Build.pm @@ -181,7 +181,7 @@ sub buildConfig for (my $iOptionIndex = 1; $iOptionIndex <= $iOptionIndexTotal; $iOptionIndex++) { # Create the indexed version of the option name - my $strOptionIndex = $iOptionIndexTotal > 1 ? + my $strOptionIndex = defined($strOptionPrefix) ? "${strOptionPrefix}${iOptionIndex}-" . substr($strOption, length($strOptionPrefix) + 1) : $strOption; # Add option data diff --git a/build/lib/pgBackRestBuild/Config/BuildDefine.pm b/build/lib/pgBackRestBuild/Config/BuildDefine.pm index f493a66eb..c29d47d1c 100644 --- a/build/lib/pgBackRestBuild/Config/BuildDefine.pm +++ b/build/lib/pgBackRestBuild/Config/BuildDefine.pm @@ -273,15 +273,6 @@ sub renderOptional $bSingleLine = true; } - if (defined($rhOptional->{&CFGDEF_ALT_NAME})) - { - $strBuildSourceOptional .= - (defined($strBuildSourceOptional) && !$bSingleLine ? "\n" : '') . - "${strIndent} CFGDEFDATA_OPTION_OPTIONAL_NAME_ALT(\"" . $rhOptional->{&CFGDEF_ALT_NAME} . "\")\n"; - - $bSingleLine = true; - } - if (defined($rhOptional->{&CFGDEF_PREFIX})) { $strBuildSourceOptional .= @@ -291,6 +282,17 @@ sub renderOptional $bSingleLine = true; } + # Output alternate name + if (!$bCommand && defined($rhOptionHelp->{&CONFIG_HELP_NAME_ALT})) + { + $strBuildSourceOptional .= + (defined($strBuildSourceOptional) && !$bSingleLine ? "\n" : '') . + "${strIndent} CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT(" . + join(', ', bldQuoteList($rhOptionHelp->{&CONFIG_HELP_NAME_ALT})) . ")\n"; + + $bSingleLine = true; + } + if ($bCommand && defined($rhOptional->{&CFGDEF_REQUIRED})) { $strBuildSourceOptional .= @@ -301,7 +303,8 @@ sub renderOptional $bSingleLine = true; } - if ($bCommand && defined($rhOptionHelp) && $rhOptionHelp->{&CONFIG_HELP_SOURCE} eq CONFIG_HELP_SOURCE_COMMAND) + if ($bCommand && defined($rhOptionHelp) && defined($rhOptionHelp->{&CONFIG_HELP_SOURCE}) && + $rhOptionHelp->{&CONFIG_HELP_SOURCE} eq CONFIG_HELP_SOURCE_COMMAND) { my $strSummary = helpFormatText($oManifest, $oDocRender, $rhOptionHelp->{&CONFIG_HELP_SUMMARY}, 0, 72); @@ -516,7 +519,7 @@ sub buildConfigDefine " )\n"; # Render optional data - my $strBuildSourceOptional = renderOptional($rhOption); + my $strBuildSourceOptional = renderOptional($rhOption, false, $hOptionHelp, $oManifest, $oDocRender); # Render command overrides foreach my $strCommand (cfgDefineCommandList()) diff --git a/build/lib/pgBackRestBuild/Config/BuildParse.pm b/build/lib/pgBackRestBuild/Config/BuildParse.pm index b7cffcf63..7f4da5993 100644 --- a/build/lib/pgBackRestBuild/Config/BuildParse.pm +++ b/build/lib/pgBackRestBuild/Config/BuildParse.pm @@ -64,7 +64,7 @@ sub buildConfigParse my $strBuildSource = "static const struct option optionList[] =\n" . - "{\n"; + "{"; foreach my $strOption (sort(keys(%{$rhConfigDefine}))) { @@ -73,37 +73,79 @@ sub buildConfigParse my $strOptionArg = ($rhOption->{&CFGDEF_TYPE} ne CFGDEF_TYPE_BOOLEAN ? " .has_arg = required_argument,\n" : ''); my $strOptionPrefix = $rhConfigDefine->{$strOption}{&CFGDEF_PREFIX}; - for (my $iOptionIdx = 0; $iOptionIdx <= $rhOption->{&CFGDEF_INDEX_TOTAL}; $iOptionIdx++) + my @stryOptionName = ($strOption); + + if (defined($rhOption->{&CFGDEF_NAME_ALT})) { - # Don't and option indexes if it is not indexeds - next if ($iOptionIdx == 1 && $rhOption->{&CFGDEF_INDEX_TOTAL} == 1); - - # Generate option name - my $strOptionName = $iOptionIdx > 0 ? - "${strOptionPrefix}${iOptionIdx}-" . substr($strOption, length($strOptionPrefix) + 1) : $strOption; - - # Generate option value used for parsing (offset is added so options don't conflict with getopt_long return values) - my $strOptionFlag = 'PARSE_OPTION_FLAG |'; - - my $strOptionVal = - ($iOptionIdx > 1 ? "(" : '') . $strOptionEnum . ($iOptionIdx > 1 ? " + " . ($iOptionIdx - 1) . ')' : ''); - - # Add option - $strBuildSource .= - " {\n" . - " .name = \"${strOptionName}\",\n" . - $strOptionArg . - " .val = ${strOptionFlag} ${strOptionVal},\n" . - " },\n"; - - # Add negation when defined - if ($rhOption->{&CFGDEF_NEGATE}) + foreach my $strOptionNameAlt (sort(keys(%{$rhOption->{&CFGDEF_NAME_ALT}}))) { + push(@stryOptionName, $strOptionNameAlt); + } + } + + $strBuildSource .= + "\n" . + " // ${strOption} option" . (@stryOptionName > 1 ? ' and deprecations' : '') . "\n" . + " // " . (qw{-} x 125) . "\n"; + + for (my $iOptionIdx = 1; $iOptionIdx <= $rhOption->{&CFGDEF_INDEX_TOTAL}; $iOptionIdx++) + { + for (my $iOptionNameIdx = 0; $iOptionNameIdx < @stryOptionName; $iOptionNameIdx++) + { + my $strOptionName = $stryOptionName[$iOptionNameIdx]; + my $rhNameAlt = $rhOption->{&CFGDEF_NAME_ALT}{$strOptionName}; + + # Skip alt name if it is not valid for this option index + if ($iOptionNameIdx > 0 && defined($rhNameAlt->{&CFGDEF_INDEX}) && $rhNameAlt->{&CFGDEF_INDEX} != $iOptionIdx) + { + next; + } + + # Generate output name + my $strOptionNameOut = $strOptionName; + + if (defined($strOptionPrefix)) + { + if ($iOptionNameIdx == 0) + { + $strOptionNameOut = + "${strOptionPrefix}${iOptionIdx}-" . substr($strOptionName, length($strOptionPrefix) + 1); + } + else + { + $strOptionNameOut =~ s/\?/$iOptionIdx/g; + } + } + + # Generate option value used for parsing (offset is added so options don't conflict with getopt_long return values) + my $strOptionFlag = 'PARSE_OPTION_FLAG |'; + + if ($iOptionNameIdx > 0) + { + $strOptionFlag .= ' PARSE_DEPRECATE_FLAG |'; + } + + my $strOptionVal = + ($iOptionIdx > 1 ? "(" : '') . $strOptionEnum . ($iOptionIdx > 1 ? " + " . ($iOptionIdx - 1) . ')' : ''); + + # Add option $strBuildSource .= " {\n" . - " .name = \"no-${strOptionName}\",\n" . - " .val = ${strOptionFlag} PARSE_NEGATE_FLAG | ${strOptionVal},\n" . + " .name = \"${strOptionNameOut}\",\n" . + $strOptionArg . + " .val = ${strOptionFlag} ${strOptionVal},\n" . " },\n"; + + # Add negation when defined + if ($rhOption->{&CFGDEF_NEGATE} && + !($iOptionNameIdx > 0 && defined($rhNameAlt->{&CFGDEF_NEGATE}) && !$rhNameAlt->{&CFGDEF_NEGATE})) + { + $strBuildSource .= + " {\n" . + " .name = \"no-${strOptionNameOut}\",\n" . + " .val = ${strOptionFlag} PARSE_NEGATE_FLAG | ${strOptionVal},\n" . + " },\n"; + } } } } diff --git a/build/lib/pgBackRestBuild/Config/Data.pm b/build/lib/pgBackRestBuild/Config/Data.pm index fb55780bc..145e38149 100644 --- a/build/lib/pgBackRestBuild/Config/Data.pm +++ b/build/lib/pgBackRestBuild/Config/Data.pm @@ -190,15 +190,50 @@ use constant CFGOPT_PERL_BIN => 'perl-bin use constant CFGOPT_PERL_OPTION => 'perl-option'; push @EXPORT, qw(CFGOPT_PERL_OPTION); -# Repository -use constant CFGOPT_REPO_PATH => 'repo-path'; - push @EXPORT, qw(CFGOPT_REPO_PATH); -use constant CFGOPT_REPO_TYPE => 'repo-type'; - push @EXPORT, qw(CFGOPT_REPO_TYPE); +# Logging +use constant CFGOPT_LOG_LEVEL_CONSOLE => 'log-level-console'; + push @EXPORT, qw(CFGOPT_LOG_LEVEL_CONSOLE); +use constant CFGOPT_LOG_LEVEL_FILE => 'log-level-file'; + push @EXPORT, qw(CFGOPT_LOG_LEVEL_FILE); +use constant CFGOPT_LOG_LEVEL_STDERR => 'log-level-stderr'; + push @EXPORT, qw(CFGOPT_LOG_LEVEL_STDERR); +use constant CFGOPT_LOG_TIMESTAMP => 'log-timestamp'; + push @EXPORT, qw(CFGOPT_LOG_TIMESTAMP); + + +# Repository options +#----------------------------------------------------------------------------------------------------------------------------------- +# Determines how many repositories can be configured +use constant CFGDEF_INDEX_REPO => 1; + push @EXPORT, qw(CFGDEF_INDEX_PG); + +# Prefix that must be used by all repo options that allow multiple configurations +use constant CFGDEF_PREFIX_REPO => 'repo'; + push @EXPORT, qw(CFGDEF_PREFIX_REPO); + +# Repository General use constant CFGOPT_REPO_CIPHER_TYPE => 'repo-cipher-type'; push @EXPORT, qw(CFGOPT_REPO_CIPHER_TYPE); use constant CFGOPT_REPO_CIPHER_PASS => 'repo-cipher-pass'; push @EXPORT, qw(CFGOPT_REPO_CIPHER_PASS); +use constant CFGOPT_REPO_HARDLINK => 'repo-hardlink'; + push @EXPORT, qw(CFGOPT_REPO_HARDLINK); +use constant CFGOPT_REPO_PATH => 'repo-path'; + push @EXPORT, qw(CFGOPT_REPO_PATH); +use constant CFGOPT_REPO_TYPE => 'repo-type'; + push @EXPORT, qw(CFGOPT_REPO_TYPE); + +# Repository Host +use constant CFGOPT_REPO_HOST => 'repo-host'; + push @EXPORT, qw(CFGOPT_REPO_HOST); +use constant CFGOPT_REPO_HOST_CMD => 'repo-host-cmd'; + push @EXPORT, qw(CFGOPT_REPO_HOST_CMD); +use constant CFGOPT_REPO_HOST_CONFIG => 'repo-host-config'; + push @EXPORT, qw(CFGOPT_REPO_HOST_CONFIG); +use constant CFGOPT_REPO_HOST_PORT => 'repo-host-port'; + push @EXPORT, qw(CFGOPT_REPO_HOST_PORT); +use constant CFGOPT_REPO_HOST_USER => 'repo-host-user'; + push @EXPORT, qw(CFGOPT_REPO_HOST_USER); # Repository S3 use constant CFGOPT_REPO_S3_KEY => 'repo-s3-key'; @@ -220,16 +255,6 @@ use constant CFGOPT_REPO_S3_REGION => 'repo-s3- use constant CFGOPT_REPO_S3_VERIFY_SSL => 'repo-s3-verify-ssl'; push @EXPORT, qw(CFGOPT_REPO_S3_VERIFY_SSL); -# Logging -use constant CFGOPT_LOG_LEVEL_CONSOLE => 'log-level-console'; - push @EXPORT, qw(CFGOPT_LOG_LEVEL_CONSOLE); -use constant CFGOPT_LOG_LEVEL_FILE => 'log-level-file'; - push @EXPORT, qw(CFGOPT_LOG_LEVEL_FILE); -use constant CFGOPT_LOG_LEVEL_STDERR => 'log-level-stderr'; - push @EXPORT, qw(CFGOPT_LOG_LEVEL_STDERR); -use constant CFGOPT_LOG_TIMESTAMP => 'log-timestamp'; - push @EXPORT, qw(CFGOPT_LOG_TIMESTAMP); - # Archive options #----------------------------------------------------------------------------------------------------------------------------------- use constant CFGOPT_ARCHIVE_ASYNC => 'archive-async'; @@ -243,22 +268,10 @@ use constant CFGOPT_ARCHIVE_CHECK => 'archive- push @EXPORT, qw(CFGOPT_ARCHIVE_CHECK); use constant CFGOPT_ARCHIVE_COPY => 'archive-copy'; push @EXPORT, qw(CFGOPT_ARCHIVE_COPY); -use constant CFGOPT_BACKUP_CMD => 'backup-cmd'; - push @EXPORT, qw(CFGOPT_BACKUP_CMD); -use constant CFGOPT_BACKUP_CONFIG => 'backup-config'; - push @EXPORT, qw(CFGOPT_BACKUP_CONFIG); -use constant CFGOPT_BACKUP_HOST => 'backup-host'; - push @EXPORT, qw(CFGOPT_BACKUP_HOST); -use constant CFGOPT_BACKUP_SSH_PORT => 'backup-ssh-port'; - push @EXPORT, qw(CFGOPT_BACKUP_SSH_PORT); use constant CFGOPT_BACKUP_STANDBY => 'backup-standby'; push @EXPORT, qw(CFGOPT_BACKUP_STANDBY); -use constant CFGOPT_BACKUP_USER => 'backup-user'; - push @EXPORT, qw(CFGOPT_BACKUP_USER); use constant CFGOPT_CHECKSUM_PAGE => 'checksum-page'; push @EXPORT, qw(CFGOPT_CHECKSUM_PAGE); -use constant CFGOPT_HARDLINK => 'hardlink'; - push @EXPORT, qw(CFGOPT_HARDLINK); use constant CFGOPT_MANIFEST_SAVE_THRESHOLD => 'manifest-save-threshold'; push @EXPORT, qw(CFGOPT_MANIFEST_SAVE_THRESHOLD); use constant CFGOPT_RESUME => 'resume'; @@ -297,29 +310,30 @@ use constant CFGOPT_RECOVERY_OPTION => 'recovery # Stanza options #----------------------------------------------------------------------------------------------------------------------------------- # Determines how many databases can be configured -use constant CFGDEF_INDEX_DB => 8; - push @EXPORT, qw(CFGDEF_INDEX_DB); +use constant CFGDEF_INDEX_PG => 8; + push @EXPORT, qw(CFGDEF_INDEX_PG); # Prefix that must be used by all db options that allow multiple configurations -use constant CFGDEF_PREFIX_DB => 'db'; - push @EXPORT, qw(CFGDEF_PREFIX_DB); +use constant CFGDEF_PREFIX_PG => 'pg'; + push @EXPORT, qw(CFGDEF_PREFIX_PG); -use constant CFGOPT_DB_CMD => CFGDEF_PREFIX_DB . '-cmd'; - push @EXPORT, qw(CFGOPT_DB_CMD); -use constant CFGOPT_DB_CONFIG => CFGDEF_PREFIX_DB . '-config'; - push @EXPORT, qw(CFGOPT_DB_CONFIG); -use constant CFGOPT_DB_HOST => CFGDEF_PREFIX_DB . '-host'; - push @EXPORT, qw(CFGOPT_DB_HOST); -use constant CFGOPT_DB_PATH => CFGDEF_PREFIX_DB . '-path'; - push @EXPORT, qw(CFGOPT_DB_PATH); -use constant CFGOPT_DB_PORT => CFGDEF_PREFIX_DB . '-port'; - push @EXPORT, qw(CFGOPT_DB_PORT); -use constant CFGOPT_DB_SSH_PORT => CFGDEF_PREFIX_DB . '-ssh-port'; - push @EXPORT, qw(CFGOPT_DB_SSH_PORT); -use constant CFGOPT_DB_SOCKET_PATH => CFGDEF_PREFIX_DB . '-socket-path'; - push @EXPORT, qw(CFGOPT_DB_SOCKET_PATH); -use constant CFGOPT_DB_USER => CFGDEF_PREFIX_DB . '-user'; - push @EXPORT, qw(CFGOPT_DB_USER); +use constant CFGOPT_PG_HOST => CFGDEF_PREFIX_PG . '-host'; + push @EXPORT, qw(CFGOPT_PG_HOST); +use constant CFGOPT_PG_HOST_CMD => CFGOPT_PG_HOST . '-cmd'; + push @EXPORT, qw(CFGOPT_PG_HOST_CMD); +use constant CFGOPT_PG_HOST_CONFIG => CFGOPT_PG_HOST . '-config'; + push @EXPORT, qw(CFGOPT_PG_HOST_CONFIG); +use constant CFGOPT_PG_HOST_PORT => CFGOPT_PG_HOST . '-port'; + push @EXPORT, qw(CFGOPT_PG_HOST_PORT); +use constant CFGOPT_PG_HOST_USER => CFGOPT_PG_HOST . '-user'; + push @EXPORT, qw(CFGOPT_PG_HOST_USER); + +use constant CFGOPT_PG_PATH => CFGDEF_PREFIX_PG . '-path'; + push @EXPORT, qw(CFGOPT_PG_PATH); +use constant CFGOPT_PG_PORT => CFGDEF_PREFIX_PG . '-port'; + push @EXPORT, qw(CFGOPT_PG_PORT); +use constant CFGOPT_PG_SOCKET_PATH => CFGDEF_PREFIX_PG . '-socket-path'; + push @EXPORT, qw(CFGOPT_PG_SOCKET_PATH); #################################################################################################################################### # Option values - for options that have a specific list of allowed values @@ -417,8 +431,6 @@ use constant CFGDEF_DEFAULT_RETENTION_MAX => 9999999; # Option defines #----------------------------------------------------------------------------------------------------------------------------------- -use constant CFGDEF_ALT_NAME => 'alt-name'; - push @EXPORT, qw(CFGDEF_ALT_NAME); use constant CFGDEF_ALLOW_LIST => 'allow-list'; push @EXPORT, qw(CFGDEF_ALLOW_LIST); use constant CFGDEF_ALLOW_RANGE => 'allow-range'; @@ -435,8 +447,12 @@ use constant CFGDEF_INDEX => 'index'; push @EXPORT, qw(CFGDEF_INDEX); use constant CFGDEF_INDEX_TOTAL => 'indexTotal'; push @EXPORT, qw(CFGDEF_INDEX_TOTAL); +use constant CFGDEF_INHERIT => 'inherit'; + push @EXPORT, qw(CFGDEF_INHERIT); use constant CFGDEF_INTERNAL => 'internal'; push @EXPORT, qw(CFGDEF_INTERNAL); +use constant CFGDEF_NAME_ALT => 'name-alt'; + push @EXPORT, qw(CFGDEF_NAME_ALT); use constant CFGDEF_NEGATE => 'negate'; push @EXPORT, qw(CFGDEF_NEGATE); use constant CFGDEF_PREFIX => 'prefix'; @@ -1142,10 +1158,14 @@ my %hConfigDefine = } }, + # Repository options + #------------------------------------------------------------------------------------------------------------------------------- &CFGOPT_REPO_CIPHER_PASS => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_SECURE => true, &CFGDEF_REQUIRED => false, &CFGDEF_DEPEND => @@ -1153,6 +1173,10 @@ my %hConfigDefine = &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_CIPHER_TYPE, &CFGDEF_DEPEND_LIST => [CFGOPTVAL_REPO_CIPHER_TYPE_AES_256_CBC], }, + &CFGDEF_NAME_ALT => + { + 'repo-cipher-pass' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => CFGOPT_REPO_TYPE, }, @@ -1160,20 +1184,156 @@ my %hConfigDefine = { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_DEFAULT => CFGOPTVAL_REPO_CIPHER_TYPE_NONE, &CFGDEF_ALLOW_LIST => [ &CFGOPTVAL_REPO_CIPHER_TYPE_NONE, &CFGOPTVAL_REPO_CIPHER_TYPE_AES_256_CBC, ], + &CFGDEF_NAME_ALT => + { + 'repo-cipher-type' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => CFGOPT_REPO_TYPE, }, + &CFGOPT_REPO_HARDLINK => + { + &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_TYPE => CFGDEF_TYPE_BOOLEAN, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, + &CFGDEF_NAME_ALT => + { + 'hardlink' => {}, + }, + &CFGDEF_DEFAULT => false, + &CFGDEF_COMMAND => + { + &CFGCMD_BACKUP => {}, + }, + }, + + &CFGOPT_REPO_HOST => + { + &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, + &CFGDEF_REQUIRED => false, + &CFGDEF_NAME_ALT => + { + 'backup-host' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + &CFGDEF_COMMAND => + { + &CFGCMD_ARCHIVE_GET => {}, + &CFGCMD_ARCHIVE_PUSH => {}, + &CFGCMD_BACKUP => + { + &CFGDEF_INTERNAL => true, + }, + &CFGCMD_CHECK => {}, + &CFGCMD_INFO => {}, + &CFGCMD_LOCAL => {}, + &CFGCMD_RESTORE => {}, + &CFGCMD_STANZA_CREATE => {}, + &CFGCMD_STANZA_DELETE => + { + &CFGDEF_INTERNAL => true, + }, + &CFGCMD_STANZA_UPGRADE => {}, + &CFGCMD_START => {}, + &CFGCMD_STOP => {}, + }, + }, + + &CFGOPT_REPO_HOST_CMD => + { + &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, + &CFGDEF_REQUIRED => false, + &CFGDEF_NAME_ALT => + { + 'backup-cmd' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_DEPEND => + { + &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_HOST + }, + }, + + &CFGOPT_REPO_HOST_CONFIG => + { + &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, + &CFGDEF_DEFAULT => CFGDEF_DEFAULT_CONFIG, + &CFGDEF_NAME_ALT => + { + 'backup-config' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_DEPEND => + { + &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_HOST + }, + }, + + &CFGOPT_REPO_HOST_PORT => + { + &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_TYPE => CFGDEF_TYPE_INTEGER, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, + &CFGDEF_REQUIRED => false, + &CFGDEF_NAME_ALT => + { + 'backup-ssh-port' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_DEPEND => + { + &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_HOST + } + }, + + &CFGOPT_REPO_HOST_USER => + { + &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, + &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, + &CFGDEF_DEFAULT => 'pgbackrest', + &CFGDEF_NAME_ALT => + { + 'backup-user' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + &CFGDEF_COMMAND => CFGOPT_REPO_HOST, + &CFGDEF_REQUIRED => false, + &CFGDEF_DEPEND => + { + &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_HOST + } + }, + &CFGOPT_REPO_PATH => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_DEFAULT => '/var/lib/' . BACKREST_EXE, + &CFGDEF_NAME_ALT => + { + 'repo-path' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => { &CFGCMD_ARCHIVE_GET => {}, @@ -1196,22 +1356,45 @@ my %hConfigDefine = &CFGOPT_REPO_S3_BUCKET => { &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_DEPEND => { &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_TYPE, &CFGDEF_DEPEND_LIST => [CFGOPTVAL_REPO_TYPE_S3], }, + &CFGDEF_NAME_ALT => + { + 'repo-s3-bucket' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => CFGOPT_REPO_TYPE, }, - &CFGOPT_REPO_S3_CA_FILE => &CFGOPT_REPO_S3_HOST, - &CFGOPT_REPO_S3_CA_PATH => &CFGOPT_REPO_S3_HOST, + &CFGOPT_REPO_S3_CA_FILE => + { + &CFGDEF_INHERIT => CFGOPT_REPO_S3_HOST, + &CFGDEF_NAME_ALT => + { + 'repo-s3-ca-file' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + }, + + &CFGOPT_REPO_S3_CA_PATH => + { + &CFGDEF_INHERIT => CFGOPT_REPO_S3_HOST, + &CFGDEF_NAME_ALT => + { + 'repo-s3-ca-path' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + }, &CFGOPT_REPO_S3_KEY => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_SECURE => true, &CFGDEF_REQUIRED => false, &CFGDEF_DEPEND => @@ -1219,29 +1402,66 @@ my %hConfigDefine = &CFGDEF_DEPEND_OPTION => CFGOPT_REPO_TYPE, &CFGDEF_DEPEND_LIST => [CFGOPTVAL_REPO_TYPE_S3], }, + &CFGDEF_NAME_ALT => + { + 'repo-s3-key' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => CFGOPT_REPO_TYPE, }, - &CFGOPT_REPO_S3_KEY_SECRET => CFGOPT_REPO_S3_KEY, + &CFGOPT_REPO_S3_KEY_SECRET => + { + &CFGDEF_INHERIT => CFGOPT_REPO_S3_KEY, + &CFGDEF_NAME_ALT => + { + 'repo-s3-key-secret' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + }, - &CFGOPT_REPO_S3_ENDPOINT => CFGOPT_REPO_S3_BUCKET, + &CFGOPT_REPO_S3_ENDPOINT => + { + &CFGDEF_INHERIT => CFGOPT_REPO_S3_BUCKET, + &CFGDEF_NAME_ALT => + { + 'repo-s3-endpoint' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + }, &CFGOPT_REPO_S3_HOST => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_REQUIRED => false, &CFGDEF_DEPEND => CFGOPT_REPO_S3_BUCKET, + &CFGDEF_NAME_ALT => + { + 'repo-s3-host' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => CFGOPT_REPO_TYPE, }, - &CFGOPT_REPO_S3_REGION => CFGOPT_REPO_S3_BUCKET, + &CFGOPT_REPO_S3_REGION, + { + &CFGDEF_INHERIT => CFGOPT_REPO_S3_BUCKET, + &CFGDEF_NAME_ALT => + { + 'repo-s3-region' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, + }, &CFGOPT_REPO_S3_VERIFY_SSL => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_BOOLEAN, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_DEFAULT => true, + &CFGDEF_NAME_ALT => + { + 'repo-s3-verify-ssl' => {&CFGDEF_INDEX => 1}, + }, &CFGDEF_COMMAND => CFGOPT_REPO_TYPE, &CFGDEF_DEPEND => CFGOPT_REPO_S3_BUCKET, }, @@ -1250,6 +1470,8 @@ my %hConfigDefine = { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, + &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, + &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, &CFGDEF_DEFAULT => CFGOPTVAL_REPO_TYPE_POSIX, &CFGDEF_ALLOW_LIST => [ @@ -1257,6 +1479,10 @@ my %hConfigDefine = &CFGOPTVAL_REPO_TYPE_POSIX, &CFGOPTVAL_REPO_TYPE_S3, ], + &CFGDEF_NAME_ALT => + { + 'repo-type' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => { &CFGCMD_ARCHIVE_GET => {}, @@ -1294,7 +1520,6 @@ my %hConfigDefine = &CFGOPT_PROCESS_MAX => { - &CFGDEF_ALT_NAME => 'thread-max', &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_INTEGER, &CFGDEF_DEFAULT => 1, @@ -1441,70 +1666,6 @@ my %hConfigDefine = } }, - &CFGOPT_BACKUP_CMD => - { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, - &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_REQUIRED => false, - &CFGDEF_COMMAND => CFGOPT_BACKUP_HOST, - &CFGDEF_DEPEND => - { - &CFGDEF_DEPEND_OPTION => CFGOPT_BACKUP_HOST - }, - }, - - &CFGOPT_BACKUP_CONFIG => - { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, - &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_DEFAULT => CFGDEF_DEFAULT_CONFIG, - &CFGDEF_COMMAND => CFGOPT_BACKUP_HOST, - &CFGDEF_DEPEND => - { - &CFGDEF_DEPEND_OPTION => CFGOPT_BACKUP_HOST - }, - }, - - &CFGOPT_BACKUP_HOST => - { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, - &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_REQUIRED => false, - &CFGDEF_COMMAND => - { - &CFGCMD_ARCHIVE_GET => {}, - &CFGCMD_ARCHIVE_PUSH => {}, - &CFGCMD_BACKUP => - { - &CFGDEF_INTERNAL => true, - }, - &CFGCMD_CHECK => {}, - &CFGCMD_INFO => {}, - &CFGCMD_LOCAL => {}, - &CFGCMD_RESTORE => {}, - &CFGCMD_STANZA_CREATE => {}, - &CFGCMD_STANZA_DELETE => - { - &CFGDEF_INTERNAL => true, - }, - &CFGCMD_STANZA_UPGRADE => {}, - &CFGCMD_START => {}, - &CFGCMD_STOP => {}, - }, - }, - - &CFGOPT_BACKUP_SSH_PORT => - { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, - &CFGDEF_TYPE => CFGDEF_TYPE_INTEGER, - &CFGDEF_REQUIRED => false, - &CFGDEF_COMMAND => CFGOPT_BACKUP_HOST, - &CFGDEF_DEPEND => - { - &CFGDEF_DEPEND_OPTION => CFGOPT_BACKUP_HOST - } - }, - &CFGOPT_BACKUP_STANDBY => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, @@ -1519,19 +1680,6 @@ my %hConfigDefine = }, }, - &CFGOPT_BACKUP_USER => - { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, - &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_DEFAULT => 'backrest', - &CFGDEF_COMMAND => CFGOPT_BACKUP_HOST, - &CFGDEF_REQUIRED => false, - &CFGDEF_DEPEND => - { - &CFGDEF_DEPEND_OPTION => CFGOPT_BACKUP_HOST - } - }, - &CFGOPT_CHECKSUM_PAGE => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, @@ -1543,17 +1691,6 @@ my %hConfigDefine = } }, - &CFGOPT_HARDLINK => - { - &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, - &CFGDEF_TYPE => CFGDEF_TYPE_BOOLEAN, - &CFGDEF_DEFAULT => false, - &CFGDEF_COMMAND => - { - &CFGCMD_BACKUP => {}, - } - }, - &CFGOPT_MANIFEST_SAVE_THRESHOLD => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, @@ -1738,12 +1875,17 @@ my %hConfigDefine = # Stanza options #------------------------------------------------------------------------------------------------------------------------------- - &CFGOPT_DB_CMD => + &CFGOPT_PG_HOST_CMD => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, + &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, &CFGDEF_REQUIRED => false, + &CFGDEF_NAME_ALT => + { + 'db-cmd' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + 'db?-cmd' => {&CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => { &CFGCMD_BACKUP => {}, @@ -1758,16 +1900,21 @@ my %hConfigDefine = }, &CFGDEF_DEPEND => { - &CFGDEF_DEPEND_OPTION => CFGOPT_DB_HOST + &CFGDEF_DEPEND_OPTION => CFGOPT_PG_HOST }, }, - &CFGOPT_DB_CONFIG => + &CFGOPT_PG_HOST_CONFIG => { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, + &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, &CFGDEF_DEFAULT => CFGDEF_DEFAULT_CONFIG, + &CFGDEF_NAME_ALT => + { + 'db-config' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + 'db?-config' => {&CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => { &CFGCMD_BACKUP => {}, @@ -1782,16 +1929,21 @@ my %hConfigDefine = }, &CFGDEF_DEPEND => { - &CFGDEF_DEPEND_OPTION => CFGOPT_DB_HOST + &CFGDEF_DEPEND_OPTION => CFGOPT_PG_HOST }, }, - &CFGOPT_DB_HOST => + &CFGOPT_PG_HOST => { &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, + &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_PUSH => {}, @@ -1808,15 +1960,20 @@ my %hConfigDefine = &CFGCMD_STANZA_UPGRADE => {}, &CFGCMD_START => {}, &CFGCMD_STOP => {}, - } + }, }, - &CFGOPT_DB_PATH => + &CFGOPT_PG_PATH => { &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, + &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, &CFGDEF_REQUIRED => true, + &CFGDEF_NAME_ALT => + { + 'db-path' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + 'db?-path' => {&CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => { &CFGCMD_ARCHIVE_GET => @@ -1844,12 +2001,17 @@ my %hConfigDefine = }, }, - &CFGOPT_DB_PORT => + &CFGOPT_PG_PORT => { &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, &CFGDEF_TYPE => CFGDEF_TYPE_INTEGER, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, + &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, &CFGDEF_DEFAULT => 5432, + &CFGDEF_NAME_ALT => + { + 'db-port' => {&CFGDEF_INDEX => 1, &CFGDEF_NEGATE => false}, + 'db?-port' => {&CFGDEF_NEGATE => false}, + }, &CFGDEF_COMMAND => { &CFGCMD_BACKUP => {}, @@ -1858,28 +2020,38 @@ my %hConfigDefine = &CFGCMD_STANZA_CREATE => {}, &CFGCMD_STANZA_DELETE => {}, &CFGCMD_STANZA_UPGRADE => {}, - } - }, - - &CFGOPT_DB_SSH_PORT => - { - &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, - &CFGDEF_TYPE => CFGDEF_TYPE_INTEGER, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, - &CFGDEF_REQUIRED => false, - &CFGDEF_COMMAND => CFGOPT_DB_HOST, - &CFGDEF_DEPEND => - { - &CFGDEF_DEPEND_OPTION => CFGOPT_DB_HOST }, }, - &CFGOPT_DB_SOCKET_PATH => + &CFGOPT_PG_HOST_PORT => { &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, + &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 + }, + }, + + &CFGOPT_PG_SOCKET_PATH => + { + &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, + &CFGDEF_PREFIX => CFGDEF_PREFIX_PG, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, &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 => {}, @@ -1892,12 +2064,17 @@ my %hConfigDefine = } }, - &CFGOPT_DB_USER => + &CFGOPT_PG_HOST_USER => { &CFGDEF_SECTION => CFGDEF_SECTION_STANZA, - &CFGDEF_PREFIX => CFGDEF_PREFIX_DB, + &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 => {}, @@ -1910,7 +2087,7 @@ my %hConfigDefine = &CFGDEF_REQUIRED => false, &CFGDEF_DEPEND => { - &CFGDEF_DEPEND_OPTION => CFGOPT_DB_HOST + &CFGDEF_DEPEND_OPTION => CFGOPT_PG_HOST }, }, ); @@ -1921,9 +2098,19 @@ my %hConfigDefine = foreach my $strKey (sort(keys(%hConfigDefine))) { # If the define is a scalar then copy the entire define from the referenced option - if (!ref($hConfigDefine{$strKey})) + if (defined($hConfigDefine{$strKey}{&CFGDEF_INHERIT})) { - $hConfigDefine{$strKey} = dclone($hConfigDefine{$hConfigDefine{$strKey}}); + # Make a copy in case there are overrides that need to be applied after inheriting + my $hConfigDefineOverride = dclone($hConfigDefine{$strKey}); + + # Copy the option being inherited from + $hConfigDefine{$strKey} = dclone($hConfigDefine{$hConfigDefine{$strKey}{&CFGDEF_INHERIT}}); + + # Apply overrides + foreach my $strOptionDef (sort(keys(%{$hConfigDefineOverride}))) + { + $hConfigDefine{$strKey}{$strOptionDef} = $hConfigDefineOverride->{$strOptionDef}; + } } # If the command section is a scalar then copy the section from the referenced option @@ -1965,11 +2152,11 @@ foreach my $strKey (sort(keys(%hConfigDefine))) $hConfigDefine{$strKey}{&CFGDEF_INTERNAL} = false; } - # Set index total for db-* + # Set index total for pg-* if (defined($hConfigDefine{$strKey}{&CFGDEF_PREFIX}) && - $hConfigDefine{$strKey}{&CFGDEF_PREFIX} eq CFGDEF_PREFIX_DB) + $hConfigDefine{$strKey}{&CFGDEF_PREFIX} eq CFGDEF_PREFIX_PG) { - $hConfigDefine{$strKey}{&CFGDEF_INDEX_TOTAL} = CFGDEF_INDEX_DB; + $hConfigDefine{$strKey}{&CFGDEF_INDEX_TOTAL} = CFGDEF_INDEX_PG; } # Else default index total is 1 else diff --git a/doc/lib/BackRestDoc/Common/DocConfig.pm b/doc/lib/BackRestDoc/Common/DocConfig.pm index 4445be225..c0b354fbf 100644 --- a/doc/lib/BackRestDoc/Common/DocConfig.pm +++ b/doc/lib/BackRestDoc/Common/DocConfig.pm @@ -27,6 +27,8 @@ use constant CONFIG_HELP_DESCRIPTION => 'descript push @EXPORT, qw(CONFIG_HELP_DESCRIPTION); use constant CONFIG_HELP_EXAMPLE => 'example'; use constant CONFIG_HELP_NAME => 'name'; +use constant CONFIG_HELP_NAME_ALT => 'name-alt'; + push @EXPORT, qw(CONFIG_HELP_NAME_ALT); use constant CONFIG_HELP_OPTION => 'option'; push @EXPORT, qw(CONFIG_HELP_OPTION); use constant CONFIG_HELP_SECTION => 'section'; @@ -316,6 +318,29 @@ sub process $$oCommandOption{&CONFIG_HELP_NAME} = $oOptionDoc->paramGet('name'); + # Generate a list of alternate names + if (defined($rhConfigDefine->{$strOption}{&CFGDEF_NAME_ALT})) + { + my $rhNameAlt = {}; + + foreach my $strNameAlt (sort(keys(%{$rhConfigDefine->{$strOption}{&CFGDEF_NAME_ALT}}))) + { + $strNameAlt =~ s/\?//g; + + if ($strNameAlt ne $strOption) + { + $rhNameAlt->{$strNameAlt} = true; + } + } + + my @stryNameAlt = sort(keys(%{$rhNameAlt})); + + if (@stryNameAlt > 0) + { + $oCommandOption->{&CONFIG_HELP_NAME_ALT} = \@stryNameAlt; + } + } + # If the option did not come from the command also store in global option list. This prevents duplication of commonly # used options. if ($strOptionSource ne CONFIG_HELP_SOURCE_COMMAND) @@ -330,6 +355,7 @@ sub process } $$oOption{&CONFIG_HELP_NAME} = $oOptionDoc->paramGet('name'); + $oOption->{&CONFIG_HELP_NAME_ALT} = $oCommandOption->{&CONFIG_HELP_NAME_ALT}; $$oOption{&CONFIG_HELP_DESCRIPTION} = $$oCommandOption{&CONFIG_HELP_DESCRIPTION}; $$oOption{&CONFIG_HELP_EXAMPLE} = $oOptionDoc->fieldGet('example'); } @@ -468,7 +494,7 @@ sub manGet if (defined($strDefault)) { - if ($strOption eq CFGOPT_BACKUP_CMD || $strOption eq CFGOPT_DB_CMD) + if ($strOption eq CFGOPT_REPO_HOST_CMD || $strOption eq CFGOPT_PG_HOST_CMD) { $strDefault = BACKREST_EXE; } @@ -779,7 +805,7 @@ sub helpOptionGet { my $strDefault; - if ($strOption eq CFGOPT_BACKUP_CMD || $strOption eq CFGOPT_DB_CMD) + if ($strOption eq CFGOPT_REPO_HOST_CMD || $strOption eq CFGOPT_PG_HOST_CMD) { $strDefault = '[INSTALL-PATH]/' . BACKREST_EXE; } @@ -840,6 +866,15 @@ sub helpOptionGet $oOptionElement-> nodeAdd('code-block')->valueSet($strCodeBlock); + + # Output deprecated names + if (defined($oOptionHash->{&CONFIG_HELP_NAME_ALT})) + { + my $strCaption = 'Deprecated Name' . (@{$oOptionHash->{&CONFIG_HELP_NAME_ALT}} > 1 ? 's' : ''); + + $oOptionElement-> + nodeAdd('p')->textSet("${strCaption}: " . join(', ', @{$oOptionHash->{&CONFIG_HELP_NAME_ALT}})); + } } 1; diff --git a/doc/lib/BackRestDoc/Common/DocExecute.pm b/doc/lib/BackRestDoc/Common/DocExecute.pm index 51eb7b70c..973a40869 100644 --- a/doc/lib/BackRestDoc/Common/DocExecute.pm +++ b/doc/lib/BackRestDoc/Common/DocExecute.pm @@ -41,25 +41,21 @@ foreach my $strKey (sort(keys(%{$rhConfigDefineIndex}))) { # Build options for all possible db configurations if (defined($rhConfigDefineIndex->{$strKey}{&CFGDEF_PREFIX}) && - $rhConfigDefineIndex->{$strKey}{&CFGDEF_PREFIX} eq CFGDEF_PREFIX_DB) + $rhConfigDefineIndex->{$strKey}{&CFGDEF_PREFIX} eq CFGDEF_PREFIX_PG) { my $strPrefix = $rhConfigDefineIndex->{$strKey}{&CFGDEF_PREFIX}; - for (my $iIndex = 1; $iIndex <= CFGDEF_INDEX_DB; $iIndex++) + for (my $iIndex = 1; $iIndex <= CFGDEF_INDEX_PG; $iIndex++) { my $strKeyNew = "${strPrefix}${iIndex}" . substr($strKey, length($strPrefix)); $rhConfigDefineIndex->{$strKeyNew} = dclone($rhConfigDefineIndex->{$strKey}); - $rhConfigDefineIndex->{$strKeyNew}{&CFGDEF_INDEX_TOTAL} = CFGDEF_INDEX_DB; + $rhConfigDefineIndex->{$strKeyNew}{&CFGDEF_INDEX_TOTAL} = CFGDEF_INDEX_PG; $rhConfigDefineIndex->{$strKeyNew}{&CFGDEF_INDEX} = $iIndex - 1; - # Create the alternate name for option index 1 - if ($iIndex == 1) - { - $rhConfigDefineIndex->{$strKeyNew}{&CFGDEF_ALT_NAME} = $strKey; - } - else + # Options indexed > 1 are never required + if ($iIndex != 1) { $rhConfigDefineIndex->{$strKeyNew}{&CFGDEF_REQUIRED} = false; } diff --git a/doc/xml/reference.xml b/doc/xml/reference.xml index 66af21897..f250c8912 100644 --- a/doc/xml/reference.xml +++ b/doc/xml/reference.xml @@ -214,57 +214,68 @@ - The repository section defines options used to configure the repository. + The repository section defines options used to configure the repository. + + Indexing: All repo- options are indexed to allow for configuring multiple repositories, though only a single repository is currently supported. For example, the repository is configured with the repo1-path, repo1-host, etc. options. - - - exe path on the backup host. + + + Repository host when operating remotely via SSH. - Required only if the path to is different on the local and backup hosts. If not defined, the backup host exe path will be set the same as the local exe path. + Make sure that trusted SSH authentication is configured between the host and the repository host. + + When backing up and archiving to a locally mounted filesystem this setting is not required. + + repo1.domain.com + + + + + exe path on the repository host. + + Required only if the path to is different on the local and repository hosts. If not defined, the repository host exe path will be set the same as the local exe path. same as local /usr/lib/backrest/bin/pgbackrest - - - backup host configuration file. + + + repository host configuration file. - Sets the location of the configuration file on the backup host. This is only required if the backup host configuration file is in a different location than the local configuration file. + Sets the location of the configuration file on the repository host. This is only required if the repository host configuration file is in a different location than the local configuration file. /etc/pgbackrest_backup.conf - - - Backup host when operating remotely via SSH. + + + Repository host user when repo-host is set. - Make sure that trusted SSH authentication is configured between the db host and the backup host. + Defines the user that will be used for operations on the repository host. Preferably this is not the postgres user but rather some other user like pgbackrest. If runs on the repository host the postgres user can be placed in the pgbackrest group so it has read permissions on the repository without being able to damage the contents accidentally. - When backing up to a locally mounted network filesystem this setting is not required. - - backup.domain.com + backup-user - - - Backup host user when backup-host is set. + + + Repository host port when repo-host is set. - Defines the user that will be used for operations on the backup server. Preferably this is not the postgres user but rather some other user like backrest. If runs on the backup server the postgres user can be placed in the backrest group so it has read permissions on the repository without being able to damage the contents accidentally. - - backrest - - - - - Backup server SSH port when backup-host is set. - - Use this option to specify a non-default SSH port for the backup server. + Use this option to specify a non-default port for the repository host protocol. Currently only SSH is supported 25 + + + Hardlink files between backups in the repository. + + Enable hard-linking of files in differential and incremental backups to their full backups. This gives the appearance that each backup is a full backup at the file-system level. Be careful, though, because modifying files that are hard-linked can affect all the backups in the set. + + y + + Path where backups and archive are stored. @@ -302,7 +313,7 @@ repositories can be stored in the bucket root by setting repo-path=/ but it is usually best to specify a prefix, such as /repo, so logs and other AWS generated content can also be stored in the bucket. - db-backup + pg-backup @@ -447,15 +458,6 @@ n - - - Hardlink files between backups. - - Enable hard-linking of files in differential and incremental backups to their full backups. This gives the appearance that each backup is a full backup. Be careful, though, because modifying files that are hard-linked can affect all the backups in the set. - - y - - Manifest save threshold during backup. @@ -667,80 +669,80 @@ A stanza defines the backup configuration for a specific database cluster. The stanza section must define the database cluster path and host/user if the database cluster is remote. Also, any global configuration sections can be overridden to define stanza-specific settings. - Indexing: All db- options can be indexed for configuring standby replicas. For example if a single standby replica is configured then index the db- options as db2- (e.g. db2-host, db2-path, etc). If an index is not specified (e.g. db-host) it will be aliased to db1- (e.g. db1-host). + Indexing: All pg- options are indexed to allow for configuring multiple hosts. For example, a single master is configured with the pg1-path, pg1-host, etc. options. If a standby is configured then index the pg- options as pg2- (e.g. pg2-host, pg2-path, etc). - - - exe path on the database host. + + + exe path on the host. - Required only if the path to is different on the local and database hosts. If not defined, the database host exe path will be set the same as the local exe path. + Required only if the path to is different on the local and hosts. If not defined, the database host exe path will be set the same as the local exe path. same as local /usr/lib/backrest/bin/pgbackrest - - + + database host configuration file. - Sets the location of the configuration file on the database host. This is only required if the database host configuration file is in a different location than the local configuration file. + Sets the location of the configuration file on the host. This is only required if the host configuration file is in a different location than the local configuration file. /etc/pgbackrest_db.conf - - - Cluster host for operating remotely via SSH. + + + host for operating remotely via SSH. - Used for backups where the database cluster host is different from the backup host. + Used for backups where the host is different from the backup host. db.domain.com - - - Cluster host logon user when db-host is set. + + + host logon user when pg-host is set. This user will also own the remote process and will initiate connections to . For this to work correctly the user should be the database cluster owner which is generally postgres, the default. db_owner - - - Cluster data directory. + + + data directory. - This should be the same as the data_directory setting in postgresql.conf. Even though this value can be read from postgresql.conf or the database cluster it is prudent to set it in case those resources are not available during a restore or offline backup scenario. + This should be the same as the data_directory setting in postgresql.conf. Even though this value can be read from postgresql.conf or it is prudent to set it in case those resources are not available during a restore or offline backup scenario. - The db-path option is tested against the value reported by on every online backup so it should always be current. + The pg-path option is tested against the value reported by on every online backup so it should always be current. /data/db - - - Cluster port. + + + port. - Port that is running on. This usually does not need to be specified as most database clusters run on the default port. + Port that is running on. This usually does not need to be specified as most clusters run on the default port. 6543 - - - Cluster unix socket path. + + + unix socket path. - The unix socket directory that was specified when was started. will automatically look in the standard location for your OS so there usually no need to specify this setting unless the socket directory was explicitly modified with the unix_socket_directory setting in postgressql.conf. + The unix socket directory that was specified when was started. will automatically look in the standard location for your OS so there is usually no need to specify this setting unless the socket directory was explicitly modified with the unix_socket_directory setting in postgresql.conf. /var/run/postgresql - - - Database server SSH port when db-host is set. + + + host port when pg-host is set. - Use this option to specify a non-default SSH port for a database server. + Use this option to specify a non-default port for the host protocol. Currently only SSH is supported 25 @@ -755,7 +757,7 @@ Commands are used to execute the various functions. Here the command options are listed exhaustively, that is, each option applicable to a command is listed with that command even if it applies to one or more other commands. This includes all the options that may also configured in pgbackrest.conf. - Non-boolean options configured in pgbackrest.conf can be reset to default on the command-line by using the no- prefix. This feature may be used to restore a backup directly on a backup host. Normally, will error because it can see that the database host is remote and restores cannot be done remotely. By adding --no-db1-host on the command-line, will ignore the remote database host and restore locally. It may be necessary to pass a new --db-path to force the restore to happen in a specific path, i.e. not the path used on the database host. + Non-boolean options configured in pgbackrest.conf can be reset to default on the command-line by using the no- prefix. This feature may be used to restore a backup directly on a backup host. Normally, will error because it can see that the database host is remote and restores cannot be done remotely. By adding --no-pg1-host on the command-line, will ignore the remote database host and restore locally. It may be necessary to pass a new --pg-path to force the restore to happen in a specific path, i.e. not the path used on the database host. If the no- prefix is used with a boolean option then the option is set to false. @@ -1190,7 +1192,7 @@ Upgrade a stanza. - Immediately after upgrading to a newer major version, the db-path for all configurations must be set to the new database location and the stanza-upgrade run on the backup host. If the database is offline use the --no-online option. + Immediately after upgrading to a newer major version, the pg-path for all configurations must be set to the new database location and the stanza-upgrade run on the backup host. If the database is offline use the --no-online option. diff --git a/doc/xml/release.xml b/doc/xml/release.xml index e4ab60140..fc3c1d369 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -77,6 +77,10 @@

Improve stanza-create command so that it does not error when the stanza already exists.

+ + +

Rename db-* options to pg-* and backup-* options to repo-* to improve consistency. repo-* options are now indexed although only one is allowed.

+ @@ -154,6 +158,10 @@ + +

List deprecated option names in documentation and command-line help.

+ + diff --git a/doc/xml/test.xml b/doc/xml/test.xml index b501b0ff9..7d2161cea 100644 --- a/doc/xml/test.xml +++ b/doc/xml/test.xml @@ -53,10 +53,10 @@ vagrant ssh

Note that process-max is only applicable to the synthetic and full tests in the backup module.

-/backrest/test/test.pl --vm=co6 --module=backup --test=full --process-max=4 --db-version=9.4 +/backrest/test/test.pl --vm=co6 --module=backup --test=full --process-max=4 --pg-version=9.4 -

Note that db-version is only applicable to the full test in the backup module.

+

Note that pg-version is only applicable to the full test in the backup module.

/backrest/test/test.pl --dry-run diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml index a9e6b46a3..3f9cc05c4 100644 --- a/doc/xml/user-guide.xml +++ b/doc/xml/user-guide.xml @@ -37,21 +37,21 @@ /var/lib/pgbackrest aes-256-cbc zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGirhPygu4jOKOXf9LO4vjfO - backrest + pgbackrest {[br-user]} /home/{[br-user]} demo /etc/{[project-exe]}.conf - /var/lib/postgresql/[version]/[cluster] - /var/lib/pgsql/[version]/data + /var/lib/postgresql/[version]/[cluster] + /var/lib/pgsql/[version]/data - /var/lib/postgresql/{[pg-version]}/{[postgres-cluster-demo]} - /var/lib/pgsql/{[pg-version]}/data + /var/lib/postgresql/{[pg-version]}/{[postgres-cluster-demo]} + /var/lib/pgsql/{[pg-version]}/data - /var/lib/postgresql/{[pg-version-upgrade]}/{[postgres-cluster-demo]} - /var/lib/pgsql/{[pg-version-upgrade]}/data + /var/lib/postgresql/{[pg-version-upgrade]}/{[postgres-cluster-demo]} + /var/lib/pgsql/{[pg-version-upgrade]}/data /var/spool/pgbackrest @@ -59,26 +59,26 @@ yum install postgresql96-server /etc/postgresql/{[pg-version]}/{[postgres-cluster-demo]}/postgresql.conf - {[db-path]}/postgresql.conf + {[pg-path]}/postgresql.conf /etc/postgresql/{[pg-version-upgrade]}/{[postgres-cluster-demo]}/postgresql.conf - {[db-path-upgrade]}/postgresql.conf + {[pg-path-upgrade]}/postgresql.conf /etc/postgresql/{[pg-version]}/{[postgres-cluster-demo]}/pg_hba.conf - {[db-path]}/pg_hba.conf + {[pg-path]}/pg_hba.conf /etc/postgresql/{[pg-version-upgrade]}/{[postgres-cluster-demo]}/pg_hba.conf - {[db-path-upgrade]}/pg_hba.conf + {[pg-path-upgrade]}/pg_hba.conf {[pg-home-path]}/.pgpass /var/log/postgresql/postgresql-{[pg-version]}-{[postgres-cluster-demo]}.log - {[db-path]}/pg_log/postgresql.log + {[pg-path]}/pg_log/postgresql.log /var/lib/pgsql/{[pg-version]}/pgstartup.log - {[db-path]}/recovery.conf - {[db-path]}/recovery.conf + {[pg-path]}/recovery.conf + {[pg-path]}/recovery.conf u16 @@ -90,15 +90,15 @@ s3-server - db-primary - {[host-user]} - {[image-repo]}:{[host-os]}-base - {[host-mount]} + pg-primary + {[host-user]} + {[image-repo]}:{[host-os]}-base + {[host-mount]} - db-standby - {[host-db-primary-user]} - {[host-db-primary-image]} - {[host-mount]} + pg-standby + {[host-pg-primary-user]} + {[host-pg-primary-image]} + {[host-mount]} backup {[host-user]} @@ -112,30 +112,30 @@ Important Data - sleep 2 + sleep 2 - pg_createcluster {[pg-version]} {[postgres-cluster-demo]} - service postgresql-{[pg-version]} initdb + pg_createcluster {[pg-version]} {[postgres-cluster-demo]} + service postgresql-{[pg-version]} initdb - pg_createcluster {[pg-version-upgrade]} {[postgres-cluster-demo]} + pg_createcluster {[pg-version-upgrade]} {[postgres-cluster-demo]} - pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} start - service postgresql-{[pg-version]} start + pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} start + service postgresql-{[pg-version]} start - pg_ctlcluster {[pg-version-upgrade]} {[postgres-cluster-demo]} start - service postgresql-{[pg-version-upgrade]} start + pg_ctlcluster {[pg-version-upgrade]} {[postgres-cluster-demo]} start + service postgresql-{[pg-version-upgrade]} start - pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} stop - service postgresql-{[pg-version]} stop + pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} stop + service postgresql-{[pg-version]} stop - pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} restart - service postgresql-{[pg-version]} restart + pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} restart + service postgresql-{[pg-version]} restart - pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} reload - service postgresql-{[pg-version]} reload + pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} reload + service postgresql-{[pg-version]} reload - pg_lsclusters - service postgresql-{[pg-version-upgrade]} status + pg_lsclusters + service postgresql-{[pg-version-upgrade]} status @@ -151,7 +151,8 @@ mkdir -m 750 -p {[pg-home-path]}/.ssh - ssh-keygen -f {[pg-home-path]}/.ssh/id_rsa -t rsa -b 4096 -N "" + ssh-keygen -f {[pg-home-path]}/.ssh/id_rsa + -t rsa -b 4096 -N "" @@ -162,7 +163,7 @@ ssh root@{[setup-ssh-host]} cat {[pg-home-path]}/.ssh/id_rsa.pub | - sudo -u backrest tee -a {[br-home-path]}/.ssh/authorized_keys + sudo -u pgbackrest tee -a {[br-home-path]}/.ssh/authorized_keys @@ -180,7 +181,7 @@ Test connection from <host>{[host-backup]}</host> to <host>{[setup-ssh-host]}</host> - + ssh postgres@{[setup-ssh-host]} -o StrictHostKeyChecking=no ls @@ -190,7 +191,7 @@ Test connection from <host>{[setup-ssh-host]}</host> to <host>{[host-backup]}</host> - ssh backrest@{[host-backup]} + ssh pgbackrest@{[host-backup]} -o StrictHostKeyChecking=no ls @@ -393,6 +394,33 @@ + +
+ Upgrading + +
+ Upgrading from v1 to v2 + +

Upgrading from v1 to v2 is fairly straight-forward. The repository format has not changed and all non-deprecated options from v1 are accepted, so for most installations it is simply a matter of installing the new version.

+ +

However, there are a few caveats:

+ + + The deprecated thread-max option is no longer valid. Use process-max instead. + + The deprecated archive-max-mb option is no longer valid. This has been replaced with the archive-queue-max option which has different semantics. + + The default for the backup-user option has changed from backrest to pgbackrest. + + Perl is executed using /usr/bin/env perl instead of /usr/bin/perl. The perl-bin option can be used to specify a perl binary if the default behavior is not working. + + +

Many option names have changed to improve consistency although the old names from v1 are still accepted. In general, db-* options have been renamed to pg-* and backup-* options have been renamed to repo-* when appropriate.

+ +

and repository options must be indexed when using the new names introduced in v2, e.g. pg1-host, pg1-path, repo1-path, repo1-type, etc. Only one repository is allowed currently but more flexibility is planned for v2.

+
+
+
Installation @@ -400,13 +428,13 @@ -

A new host named db-primary is created to contain the demo cluster and run examples.

+

A new host named pg-primary is created to contain the demo cluster and run examples.

- +

If has been installed before it's best to be sure that no prior copies of it are still installed. Depending on how old the version of pgBackRest is it may have been installed in a few different locations. The following commands will remove all prior versions of pgBackRest.

- + Remove prior <backrest/> installations @@ -430,14 +458,14 @@ - {[host-db-primary]} + {[host-pg-primary]} postgres postgres

should now be properly installed but it is best to check. If any dependencies were missed then you will get an error when running from the command line.

- + Make sure the installation worked @@ -458,23 +486,23 @@

Creating the demo cluster is optional but is strongly recommended, especially for new users, since the example commands in the user guide reference the demo cluster; the examples assume the demo cluster is running on the default port (i.e. 5432). The cluster will not be started until a later section because there is still some configuration to do.

- + Create the demo cluster {[pg-bin-path]}/initdb - -D {[db-path]} -k -A peer + -D {[pg-path]} -k -A peer - {[db-cluster-create]} + {[pg-cluster-create]}

By default will only accept local connections. The examples in this guide will require connections from other servers so listen_addresses is configured to listen on all interfaces. This may not be appropriate for secure installations.

- + Set <pg-option>listen_addresses</pg-option> '*' @@ -482,7 +510,7 @@

For demonstration purposes the log_line_prefix setting will be minimally configured. This keeps the log output as brief as possible to better illustrate important information.

- + Set <pg-option>log_line_prefix</pg-option> '' @@ -490,7 +518,7 @@

By default {[user-guide-os]} includes the day of the week in the log filename. This makes automating the user guide a bit more complicated so the log_filename is set to a constant.

- + Set <pg-option>log_filename</pg-option> 'postgresql.log' @@ -505,16 +533,16 @@

The name 'demo' describes the purpose of this cluster accurately so that will also make a good stanza name.

-

needs to know where the base data directory for the cluster is located. The path can be requested from directly but in a recovery scenario the process will not be available. During backups the value supplied to will be compared against the path that is running on and they must be equal or the backup will return an error. Make sure that db-path is exactly equal to data_directory in postgresql.conf.

+

needs to know where the base data directory for the cluster is located. The path can be requested from directly but in a recovery scenario the process will not be available. During backups the value supplied to will be compared against the path that is running on and they must be equal or the backup will return an error. Make sure that pg-path is exactly equal to data_directory in postgresql.conf.

-

By default {[user-guide-os]} stores clusters in {[db-path-default]} so it is easy to determine the correct path for the data directory.

+

By default {[user-guide-os]} stores clusters in {[pg-path-default]} so it is easy to determine the correct path for the data directory.

When creating the {[backrest-config-demo]} file, the database owner (usually postgres) must be granted read privileges.

- + Configure the <postgres/> cluster data directory - {[db-path]} + {[pg-path]} off n @@ -532,17 +560,17 @@

For this demonstration the repository will be stored on the same host as the server. This is the simplest configuration and is useful in cases where traditional backup software is employed to backup the database host.

- {[host-db-primary]} + {[host-pg-primary]} postgres postgres

The repository path must be configured so knows where to find it.

- + Configure the <backrest/> repository path - {[backrest-repo-path]} + {[backrest-repo-path]}
@@ -552,7 +580,7 @@

Backing up a running cluster requires WAL archiving to be enabled. Note that at least one WAL segment will be created during the backup process even if no explicit writes are made to the cluster.

- + Configure archive settings '{[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} archive-push %p' @@ -565,15 +593,15 @@

The cluster must be restarted after making these changes and before performing a backup.

- + Restart the {[postgres-cluster-demo]} cluster - {[db-cluster-restart]} + {[pg-cluster-restart]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -586,7 +614,7 @@

expires backups based on retention options.

- + Configure retention to 2 full backups 2 @@ -604,11 +632,11 @@

It is important to use a long, random passphrase for the cipher key. A good way to generate one is to run: openssl rand -base64 48.

- + Configure <backrest/> repository encryption - {[backrest-repo-cipher-type]} - {[backrest-repo-cipher-pass]} + {[backrest-repo-cipher-type]} + {[backrest-repo-cipher-pass]}

Once the repository has been configured and the stanza created and checked, the repository encryption settings cannot be changed.

@@ -620,7 +648,7 @@

The stanza-create command must be run on the host where the repository is located to initialize the stanza. It is recommended that the check command be run after stanza-create to ensure archiving and backups are properly configured.

- + Create the stanza and check the configuration @@ -635,7 +663,7 @@ Check the Configuration - + Check the configuration @@ -645,7 +673,7 @@ - + Example of an invalid configuration @@ -661,7 +689,7 @@

To perform a backup of the cluster run with the backup command.

- + Backup the {[postgres-cluster-demo]} cluster @@ -679,7 +707,7 @@

The type option can be used to specify a full or differential backup.

- + Differential backup of the {[postgres-cluster-demo]} cluster @@ -717,7 +745,7 @@

Use the info command to get information about backups.

- + Get info for the {[postgres-cluster-demo]} cluster @@ -745,30 +773,30 @@

Backups can protect you from a number of disaster scenarios, the most common of which are hardware failure and data corruption. The easiest way to simulate data corruption is to remove an important cluster file.

- + Stop the {[postgres-cluster-demo]} cluster and delete the <file>pg_control</file> file - {[db-cluster-stop]} + {[pg-cluster-stop]} - rm {[db-path]}/global/pg_control + rm {[pg-path]}/global/pg_control

Starting the cluster without this important file will result in an error.

- + Attempt to start the corrupted {[postgres-cluster-demo]} cluster - {[db-cluster-start]} + {[pg-cluster-start]} could not find the database system - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -776,7 +804,7 @@ - {[db-cluster-start]} + {[pg-cluster-start]} @@ -788,15 +816,15 @@

To restore a backup of the cluster run with the restore command. The cluster needs to be stopped (in this case it is already stopped) and all files must be removed from the data directory.

- + Remove old files from {[postgres-cluster-demo]} cluster - find {[db-path]} -mindepth 1 -delete + find {[pg-path]} -mindepth 1 -delete - + Restore the {[postgres-cluster-demo]} cluster and start <postgres/> @@ -804,11 +832,11 @@ - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -830,7 +858,7 @@

By default will wait for the next regularly scheduled checkpoint before starting a backup. Depending on the checkpoint_timeout and checkpoint_segments settings in it may be quite some time before a checkpoint completes and the backup can begin.

- + Incremental backup of the {[postgres-cluster-demo]} cluster with the regularly scheduled checkpoint @@ -842,13 +870,13 @@

When {[dash]}-start-fast is passed on the command-line or start-fast=y is set in {[backrest-config-demo]} an immediate checkpoint is requested and the backup will start more quickly. This is convenient for testing and for ad-hoc backups. For instance, if a backup is being taken at the beginning of a release window it makes no sense to wait for a checkpoint. Since regularly scheduled backups generally only happen once per day it is unlikely that enabling the start-fast in {[backrest-config-demo]} will negatively affect performance, however for high-volume transactional systems you may want to pass {[dash]}-start-fast on the command-line instead. Alternately, it is possible to override the setting in the configuration file by passing {[dash]}-no-start-fast on the command-line.

- + Enable the <br-option>start-fast</br-option> option y - + Incremental backup of the {[postgres-cluster-demo]} cluster with an immediate checkpoint @@ -867,7 +895,7 @@

Here an error is intentionally caused by removing repository permissions.

- + Revoke write privileges in the <backrest/> repository and attempt a backup @@ -883,7 +911,7 @@

Even when the permissions are fixed will still be unable to perform a backup because the cluster is stuck in backup mode.

- + Restore write privileges in the <backrest/> repository and attempt a backup @@ -899,7 +927,7 @@

Enabling the stop-auto option allows to stop the current backup if it detects that no other backup process is running.

- + Enable the <br-option>stop-auto</br-option> option y @@ -907,7 +935,7 @@

Now will stop the old backup and start a new one so the process completes successfully.

- + Perform an incremental backup @@ -942,7 +970,7 @@

Set retention-full to the number of full backups required. New backups must be completed before expiration will occur &mdash; that means if retention-full=2 then there will be three full backups stored before the oldest one is expired.

- + Configure <br-option>retention-full</br-option> 2 @@ -950,7 +978,7 @@

Backup retention-full=2 but currently there is only one full backup so the next full backup to run will not expire any full backups.

- + Perform a full backup @@ -966,7 +994,7 @@

Archive is expired because WAL segments were generated before the oldest backup. These are not useful for recovery &mdash; only WAL segments generated after a backup can be used to recover that backup.

- + Perform a full backup @@ -985,7 +1013,7 @@

Set retention-diff to the number of differential backups required. Differentials only rely on the prior full backup so it is possible to create a rolling set of differentials for the last day or more. This allows quick restores to recent points-in-time but reduces overall space consumption.

- + Configure <br-option>retention-diff</br-option> 1 @@ -993,7 +1021,7 @@

Backup retention-diff=1 so two differentials will need to be performed before one is expired. An incremental backup is added to demonstrate incremental expiration. Incremental backups cannot be expired independently &mdash; they are always expired with their related full or differential backup.

- + Perform differential and incremental backups @@ -1011,7 +1039,7 @@

Now performing a differential backup will expire the previous differential and incremental backups leaving only one differential backup.

- + Perform a differential backup @@ -1030,13 +1058,13 @@

Expiring archive will never remove WAL segments that are required to make a backup consistent. However, since Point-in-Time-Recovery (PITR) only works on a continuous WAL stream, care should be taken when aggressively expiring archive outside of the normal backup expiration process.

- + Configure <br-option>retention-diff</br-option> 2 - + Perform differential backup @@ -1061,7 +1089,7 @@ - + Expire archive @@ -1089,11 +1117,11 @@

Restore a Backup in Quick Start required the database cluster directory to be cleaned before the restore could be performed. The delta option allows to automatically determine which files in the database cluster directory can be preserved and which ones need to be restored from the backup &mdash; it also removes files not present in the backup manifest so it will dispose of divergent changes. This is accomplished by calculating a SHA-1 cryptographic hash for each file in the database cluster directory. If the SHA-1 hash does not match the hash stored in the backup then that file will be restored. This operation is very efficient when combined with the process-max option. Since the server is shut down during the restore, a larger number of processes can be used than might be desirable during a backup when the server is running.

- + Stop the {[postgres-cluster-demo]} cluster, perform delta restore - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -1103,15 +1131,15 @@ - + Restart <postgres/> - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -1124,7 +1152,7 @@

To demonstrate this feature two databases are created: test1 and test2. A fresh backup is run so is aware of the new databases.

- + Create two test databases and perform a backup @@ -1146,7 +1174,7 @@

Each test database will be seeded with tables and data to demonstrate that recovery works with selective restore.

- + Create a test table in each database @@ -1166,23 +1194,23 @@

One of the main reasons to use selective restore is to save space. The size of the test1 database is shown here so it can be compared with the disk utilization after a selective restore.

- + Show space used by test1 database - du -sh {[db-path]}/base/16384 + du -sh {[pg-path]}/base/16384

Stop the cluster and restore only the test2 database. Built-in databases (template0, template1, and postgres) are always restored.

- + Restore from last backup including only the test2 database - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -1191,17 +1219,17 @@ - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]}

Once recovery is complete the test2 database will contain all previously created tables and data.

- + Demonstrate that the test2 database was recovered @@ -1213,7 +1241,7 @@

The test1 database, despite successful recovery, is not accessible. This is because the entire database was restored as sparse, zeroed files. can successfully apply WAL on the zeroed files but the database as a whole will not be valid because key files contain no data. This is purposeful to prevent the database from being accidentally used when it might contain partial data that was applied during WAL replay.

- + Attempting to connect to the test1 database will produce an error @@ -1228,19 +1256,19 @@

It is clear that the test1 database uses far less disk space during the selective restore than it would have if the entire database had been restored.

- + Show space used by test1 database after recovery - du -sh {[db-path]}/base/16384 + du -sh {[pg-path]}/base/16384

At this point the only action that can be taken on the invalid test1 database is drop database. does not automatically drop the database since this cannot be done until recovery is complete and the cluster is accessible.

- + Drop the test1 database @@ -1252,7 +1280,7 @@

Now that the invalid test1 database has been dropped only the test2 and built-in databases remain.

- + List remaining databases @@ -1273,7 +1301,7 @@

Point-in-Time Recovery (PITR) allows the WAL to be played from the last backup to a specified time, transaction id, or recovery point. For common recovery scenarios time-based recovery is arguably the most useful. A typical recovery scenario is to restore a table that was accidentally dropped or data that was accidentally deleted. Recovering a dropped table is more dramatic so that's the example given here but deleted data would be recovered in exactly the same way.

- + Backup the {[postgres-cluster-demo]} cluster and create a table with very important data @@ -1294,7 +1322,7 @@

It is important to represent the time as reckoned by and to include timezone offsets. This reduces the possibility of unintended timezone conversions and an unexpected recovery result.

- + Get the time from <postgres/> @@ -1306,7 +1334,7 @@

Now that the time has been recorded the table is dropped. In practice finding the exact time that the table was dropped is a lot harder than in this example. It may not be possible to find the exact time, but some forensic work should be able to get you close.

- + Drop the important table @@ -1320,11 +1348,11 @@

Now the restore can be performed with time-based recovery to bring back the missing table.

- + Stop <postgres/>, restore the {[postgres-cluster-demo]} cluster to <id>{[time-recovery-timestamp]}</id>, and display <file>recovery.conf</file> - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -1344,15 +1372,15 @@

The recovery.conf file has been automatically generated by so can be started immediately. Once has finished recovery the table will exist again and can be queried.

- + Start <postgres/> and check that the important table exists - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -1363,7 +1391,7 @@

The log also contains valuable information. It will indicate the time and transaction where the recovery stopped and also give the time of the last transaction to be applied.

- + Examine the <postgres/> log output @@ -1374,7 +1402,7 @@

This example was rigged to give the correct result. If a backup after the required time is chosen then will not be able to recover the lost table. can only play forward, not backward. To demonstrate this the important table must be dropped (again).

- + Drop the important table (again) @@ -1388,7 +1416,7 @@

Now take a new backup and attempt recovery from the new backup.

- + Perform a backup then attempt recovery from that backup @@ -1400,7 +1428,7 @@ - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -1413,11 +1441,11 @@ - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -1428,7 +1456,7 @@

Looking at the log output it's not obvious that recovery failed to restore the table. The key is to look for the presence of the recovery stopping before... and last completed transaction... log messages. If they are not present then the recovery to the specified point-in-time was not successful.

- + Examine the <postgres/> log output to discover the recovery was not successful @@ -1439,7 +1467,7 @@

Using an earlier backup will allow to play forward to the correct time. The info command can be used to find the next to last backup.

- + Get backup info for the {[postgres-cluster-demo]} cluster @@ -1450,11 +1478,11 @@

The default behavior for restore is to use the last backup but an earlier backup can be specified with the {[dash]}-set option.

- + Stop <postgres/>, restore from the selected backup, and start <postgres/> - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -1470,11 +1498,11 @@ - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -1485,7 +1513,7 @@

Now the the log output will contain the expected recovery stopping before... and last completed transaction... messages showing that the recovery was successful.

- + Examine the <postgres/> log output for log messages indicating success @@ -1501,31 +1529,31 @@

supports storing repositories in Amazon S3.

- + Clear the cipher settings - none - + none + - + Configure <proper>S3</proper> - s3 - / - accessKey1 - verySecretKey1 - demo-bucket - s3.amazonaws.com - us-east-1 - n + s3 + / + accessKey1 + verySecretKey1 + demo-bucket + s3.amazonaws.com + us-east-1 + n 4

Commands are run exactly as if the repository were stored on a local disk.

- + Create the stanza @@ -1546,7 +1574,7 @@

File creation time in S3 is relatively slow so commands benefit by increasing process-max to parallelize file creation.

- + Backup the {[postgres-cluster-demo]} cluster @@ -1563,15 +1591,15 @@ - + Stop <postgres/> cluster to be removed - {[db-cluster-stop]} + {[pg-cluster-stop]} - + Stop <backrest/> for the stanza @@ -1580,7 +1608,7 @@ - + Delete the stanza @@ -1589,7 +1617,7 @@ - {[db-cluster-start]} + {[pg-cluster-start]} @@ -1646,16 +1674,17 @@ Create <host>{[host-backup]}</host> host key pair - + mkdir -m 750 {[br-home-path]}/.ssh - - ssh-keygen -f {[br-home-path]}/.ssh/id_rsa -t rsa -b 4096 -N "" + + ssh-keygen -f {[br-home-path]}/.ssh/id_rsa + -t rsa -b 4096 -N "" - {[host-db-primary]} + {[host-pg-primary]} @@ -1663,20 +1692,20 @@
Configuration - + Configure the <backrest/> repository path - {[backrest-repo-path]} + {[backrest-repo-path]} -

The backup host must be configured with the db-primary host/user and database path. The primary will be configured as db1 to allow a standby to be added later.

+

The backup host must be configured with the pg-primary host/user and database path. The primary will be configured as db1 to allow a standby to be added later.

- - Configure <br-option>db1-host</br-option>/<br-option>db1-user</br-option> and <br-option>db1-path</br-option> + + Configure <br-option>pg1-host</br-option>/<br-option>pg1-host-user</br-option> and <br-option>pg1-path</br-option> - {[db-path]} - {[host-db-primary]} - postgres + {[pg-path]} + {[host-pg-primary]} + postgres y 2 @@ -1687,13 +1716,12 @@

The database host must be configured with the backup host/user. The default for the backup-user option is backrest. If the postgres user does restores on the backup host it is best not to also allow the postgres user to perform backups. However, the postgres user can read the repository directly if it is in the same group as the backrest user.

- - Configure <br-option>backup-host</br-option>/<br-option>backup-user</br-option> + + Configure <br-option>repo1-host</br-option>/<br-option>repo1-host-user</br-option> - {[db-path]} + {[pg-path]} - {[host-backup]} - backrest + {[host-backup]} detail @@ -1708,14 +1736,14 @@ Create the stanza - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} stanza-create

Check that the configuration is correct on both the database and backup hosts. More information about the check command can be found in Check the Configuration.

- + Check the configuration @@ -1726,7 +1754,7 @@ Check the configuration - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} check @@ -1741,7 +1769,7 @@ Backup the {[postgres-cluster-demo]} cluster - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} backup @@ -1755,11 +1783,11 @@

To perform a restore of the cluster run with the restore command on the database host.

- + Stop the {[postgres-cluster-demo]} cluster, restore, and restart <postgres/> - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -1767,11 +1795,11 @@ - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -1780,7 +1808,7 @@ Backup the {[postgres-cluster-demo]} cluster - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} backup @@ -1796,7 +1824,7 @@

NOTE: In the original implementation of asynchronous archiving, WAL segments were copied to the spool directory before compression and transfer. The new implementation copies WAL directly from the pg_xlog directory. If asynchronous archiving was utilized in v1.12 or prior, read the v1.13 release notes carefully before upgrading.

- + Create the spool directory @@ -1809,7 +1837,7 @@

The spool path must be configured and asynchronous archiving enabled. Asynchronous archiving automatically confers some benefit by reducing the number of ssh connections made to the backup server, but setting process-max can drastically improve performance. Be sure not to set process-max so high that it affects normal database operations.

- + Configure the spool path and asynchronous archiving {[spool-path]} @@ -1819,7 +1847,7 @@

The archive-async.log file can be used to monitor the activity of the asynchronous process. A good way to test this is to quickly push a number of WAL segments.

- + Test parallel asynchronous archiving @@ -1845,7 +1873,7 @@

Now the log file will contain parallel, asynchronous activity.

- + Check results in the log @@ -1878,12 +1906,12 @@ Perform a backup with single process - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} {[dash]}-type=full backup - + Configure <backrest/> to use multiple <cmd>backup</cmd> processes 3 @@ -1892,7 +1920,7 @@ Perform a backup with multiple processes - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} {[dash]}-type=full backup @@ -1900,7 +1928,7 @@ Get backup info for the {[postgres-cluster-demo]} cluster - + {[project-exe]} info timestamp start/stop @@ -1915,7 +1943,7 @@

Sometimes it is useful to prevent from running on a system. For example, when failing over from a primary to a standby it's best to prevent from running on the old primary in case gets restarted or can't be completely killed. This will also prevent from running on cron.

- + Stop the <backrest/> services @@ -1928,7 +1956,7 @@ Attempt a backup - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} backup \: stop file exists for all stanzas @@ -1936,7 +1964,7 @@

Specify the --force option to terminate any process that are currently running. If is already stopped then stopping again will generate a warning.

- + Stop the <backrest/> services again @@ -1946,7 +1974,7 @@

Start processes again with the start command.

- + Start the <backrest/> services @@ -1956,7 +1984,7 @@

It is also possible to stop for a single stanza.

- + Stop <backrest/> services for the <id>demo</id> stanza @@ -1969,7 +1997,7 @@ Attempt a backup - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} backup \: stop file exists for stanza demo @@ -1977,7 +2005,7 @@

The stanza must also be specified when starting the processes for a single stanza.

- + Start the <backrest/> services for the <id>demo</id> stanza @@ -1996,12 +2024,12 @@
Installation -

A new host named db-standby is created to run the standby.

+

A new host named pg-standby is created to run the standby.

- + - {[host-db-standby]} + {[host-pg-standby]} postgres postgres @@ -2016,7 +2044,7 @@ - {[host-db-standby]} + {[host-pg-standby]}
@@ -2026,14 +2054,14 @@

A hot standby performs replication using the WAL archive and allows read-only queries.

-

configuration is very similar to db-primary except that the standby_mode setting will be enabled to keep the cluster in recovery mode when the end of the WAL stream has been reached.

+

configuration is very similar to pg-primary except that the standby_mode setting will be enabled to keep the cluster in recovery mode when the end of the WAL stream has been reached.

- + Configure <backrest/> on the standby - {[db-path]} + {[pg-path]} - {[host-backup]} + {[host-backup]} standby_mode=on @@ -2043,29 +2071,29 @@

The demo cluster must be created (even though it will be overwritten restore) in order to create the configuration files.

- + Create demo cluster - {[db-cluster-create]} + {[pg-cluster-create]}

Create the path where will be restored.

- + Create <postgres/> path - mkdir -p -m 700 {[db-path]} + mkdir -p -m 700 {[pg-path]}

Now the standby can be created with the restore command.

- + Restore the {[postgres-cluster-demo]} standby cluster @@ -2083,9 +2111,9 @@

Note that the standby_mode setting has been written into the recovery.conf file. Configuring recovery settings in means that the recovery.conf file does not need to be stored elsewhere since it will be properly recreated with each restore. The --type=preserve option can be used with the restore to leave the existing recovery.conf file in place if that behavior is preferred.

-

The hot_standby setting must be enabled before starting to allow read-only connections on db-standby. Otherwise, connection attempts will be refused.

+

The hot_standby setting must be enabled before starting to allow read-only connections on pg-standby. Otherwise, connection attempts will be refused.

- + Enable <pg-option>hot_standby</pg-option> and configure logging on @@ -2093,7 +2121,7 @@ '' - + Start <postgres/> @@ -2101,17 +2129,17 @@ - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]}

The log gives valuable information about the recovery. Note especially that the cluster has entered standby mode and is ready to accept read-only connections.

- + Examine the <postgres/> log output for log messages indicating success @@ -2120,9 +2148,9 @@ -

An easy way to test that replication is properly configured is to create a table on db-primary.

+

An easy way to test that replication is properly configured is to create a table on pg-primary.

- + Create a new table on the primary @@ -2138,9 +2166,9 @@ -

And then query the same table on db-standby.

+

And then query the same table on pg-standby.

- + Query new table on the standby @@ -2149,11 +2177,11 @@ -

So, what went wrong? Since is pulling WAL segments from the archive to perform replication, changes won't be seen on the standby until the WAL segment that contains those changes is pushed from db-primary.

+

So, what went wrong? Since is pulling WAL segments from the archive to perform replication, changes won't be seen on the standby until the WAL segment that contains those changes is pushed from pg-primary.

This can be done manually by calling pg_switch_xlog() which pushes the current WAL segment to the archive (a new WAL segment is created to contain further changes).

- + Call <code>pg_switch_xlog()</code> @@ -2163,9 +2191,9 @@ -

Now after a short delay the table will appear on db-standby.

+

Now after a short delay the table will appear on pg-standby.

- + Now the new table exists on the standby (may require a few retries) @@ -2177,7 +2205,7 @@

Check the standby configuration for access to the repository.

- + Check the configuration @@ -2195,7 +2223,7 @@

Streaming replication requires a user with the replication privilege.

- + Create replication user @@ -2206,41 +2234,41 @@ -

The pg_hba.conf file must be updated to allow the standby to connect as the replication user. Be sure to replace the IP address below with the actual IP address of your db-primary. A reload will be required after modifying the pg_hba.conf file.

+

The pg_hba.conf file must be updated to allow the standby to connect as the replication user. Be sure to replace the IP address below with the actual IP address of your pg-primary. A reload will be required after modifying the pg_hba.conf file.

- + Create <file>pg_hba.conf</file> entry for replication user sh -c 'echo - "host replication replicator {[host-db-standby-ip]}/32 md5" + "host replication replicator {[host-pg-standby-ip]}/32 md5" >> {[postgres-hba-demo]}' - {[db-cluster-reload]} + {[pg-cluster-reload]}

The standby needs to know how to contact the primary so the primary_conninfo setting will be configured in .

- + Set <pg-option>primary_conninfo</pg-option> - primary_conninfo=host={[host-db-primary-ip]} port=5432 user=replicator + primary_conninfo=host={[host-pg-primary-ip]} port=5432 user=replicator

It is possible to configure a password in the primary_conninfo setting but using a .pgpass file is more flexible and secure.

- + Configure the replication password in the <file>.pgpass</file> file. sh -c 'echo - "{[host-db-primary-ip]}:*:replication:replicator:jw8s0F4" + "{[host-pg-primary-ip]}:*:replication:replicator:jw8s0F4" >> {[postgres-pgpass]}' @@ -2252,11 +2280,11 @@

Now the standby can be created with the restore command.

- + Stop <postgres/> and restore the {[postgres-cluster-demo]} standby cluster - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -2268,15 +2296,15 @@ -

By default {[user-guide-os]} stores the postgresql.conf file in the data directory. That means the change made to postgresql.conf was overwritten by the last restore and the hot_standby setting must be enabled again. Other solutions to this problem are to store the postgresql.conf file elsewhere or to enable the hot_standby setting on the db-primary host where it will be ignored.

+

By default {[user-guide-os]} stores the postgresql.conf file in the data directory. That means the change made to postgresql.conf was overwritten by the last restore and the hot_standby setting must be enabled again. Other solutions to this problem are to store the postgresql.conf file elsewhere or to enable the hot_standby setting on the pg-primary host where it will be ignored.

- + Enable <pg-option>hot_standby</pg-option> on - + Start <postgres/> @@ -2284,17 +2312,17 @@ - {[db-cluster-start]} + {[pg-cluster-start]} - {[db-cluster-wait]} + {[pg-cluster-wait]}

The log will confirm that streaming replication has started.

- + Examine the <postgres/> log output for log messages indicating success @@ -2303,9 +2331,9 @@ -

Now when a table is created on db-primary it will appear on db-standby quickly and without the need to call pg_switch_xlog().

+

Now when a table is created on pg-primary it will appear on pg-standby quickly and without the need to call pg_switch_xlog().

- + Create a new table on the primary @@ -2321,7 +2349,7 @@ - + Query table on the standby @@ -2337,14 +2365,14 @@
Backup from a Standby -

can perform backups on a standby instead of the primary. Standby backups require the db-standby host to be configured and the backup-standby option enabled. If more than one standby is configured then the first running standby found will be used for the backup.

+

can perform backups on a standby instead of the primary. Standby backups require the pg-standby host to be configured and the backup-standby option enabled. If more than one standby is configured then the first running standby found will be used for the backup.

- - Configure <br-option>db2-host</br-option>/<br-option>db2-user</br-option> and <br-option>db2-path</br-option> + + Configure <br-option>pg2-host</br-option>/<br-option>pg2-host-user</br-option> and <br-option>pg2-path</br-option> - {[db-path]} - {[host-db-standby]} - postgres + {[pg-path]} + {[host-pg-standby]} + postgres y @@ -2352,17 +2380,17 @@

Both the primary and standby databases are required to perform the backup, though the vast majority of the files will be copied from the standby to reduce load on the primary. The database hosts can be configured in any order. will automatically determine which is the primary and which is the standby.

- Backup the {[postgres-cluster-demo]} cluster from <host>db-standby</host> + Backup the {[postgres-cluster-demo]} cluster from <host>pg-standby</host> - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} --log-level-console=detail backup - backup file db-primary|replay on the standby + backup file pg-primary|replay on the standby -

This incremental backup shows that most of the files are copied from the db-standby host and only a few are copied from the db-primary host.

+

This incremental backup shows that most of the files are copied from the pg-standby host and only a few are copied from the pg-primary host.

-

creates a standby backup that is identical to a backup performed on the primary. It does this by starting/stopping the backup on the db-primary host, copying only files that are replicated from the db-standby host, then copying the remaining few files from the db-primary host. This means that logs and statistics from the primary database will be included in the backup.

+

creates a standby backup that is identical to a backup performed on the primary. It does this by starting/stopping the backup on the pg-primary host, copying only files that are replicated from the pg-standby host, then copying the remaining few files from the pg-primary host. This means that logs and statistics from the primary database will be included in the backup.

@@ -2372,11 +2400,11 @@

The following instructions are not meant to be a comprehensive guide for upgrading , rather they outline the general process for upgrading a primary and standby with the intent of demonstrating the steps required to reconfigure . It is recommended that a backup be taken prior to upgrading.

- + Stop old cluster and install new <postgres/> version - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -2391,11 +2419,11 @@

Stop the old cluster on the standby since it will be restored from the newly upgraded cluster.

- + Stop old cluster and install new <postgres/> version - {[db-cluster-stop]} + {[pg-cluster-stop]} @@ -2410,18 +2438,18 @@

Create the new cluster and perform upgrade.

- + Create new cluster and perform the upgrade {[pg-bin-upgrade-path]}/initdb - -D {[db-path-upgrade]} -k -A peer + -D {[pg-path-upgrade]} -k -A peer - {[db-cluster-create-upgrade]} + {[pg-cluster-create-upgrade]} @@ -2429,8 +2457,8 @@ /usr/lib/postgresql/{[pg-version-upgrade]}/bin/pg_upgrade {[dash]}-old-bindir=/usr/lib/postgresql/{[pg-version]}/bin {[dash]}-new-bindir=/usr/lib/postgresql/{[pg-version-upgrade]}/bin - {[dash]}-old-datadir={[db-path]} - {[dash]}-new-datadir={[db-path-upgrade]} + {[dash]}-old-datadir={[pg-path]} + {[dash]}-new-datadir={[pg-path-upgrade]} {[dash]}-old-options=" -c config_file={[postgres-config-demo]}" {[dash]}-new-options=" -c config_file={[postgres-config-demo-upgrade]}"' @@ -2442,8 +2470,8 @@ /usr/pgsql-{[pg-version-upgrade]}/bin/pg_upgrade {[dash]}-old-bindir=/usr/pgsql-{[pg-version]}/bin {[dash]}-new-bindir=/usr/pgsql-{[pg-version-upgrade]}/bin - {[dash]}-old-datadir={[db-path]} - {[dash]}-new-datadir={[db-path-upgrade]} + {[dash]}-old-datadir={[pg-path]} + {[dash]}-new-datadir={[pg-path-upgrade]} {[dash]}-old-options=" -c config_file={[postgres-config-demo]}" {[dash]}-new-options=" -c config_file={[postgres-config-demo-upgrade]}"' @@ -2453,7 +2481,7 @@

Configure the new cluster settings and port.

- + Configure <postgres/> '{[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} archive-push %p' @@ -2467,28 +2495,28 @@

Update the configuration on all systems to point to the new cluster.

- - Upgrade the <br-option>db-path</br-option> + + Upgrade the <br-option>pg1-path</br-option> - {[db-path-upgrade]} + {[pg-path-upgrade]} - - Upgrade the <br-option>db-path</br-option> + + Upgrade the <br-option>pg-path</br-option> - {[db-path-upgrade]} + {[pg-path-upgrade]} - - Upgrade <br-option>db1-path</br-option> and <br-option>db2-path</br-option>, disable backup from standby + + Upgrade <br-option>pg1-path</br-option> and <br-option>pg2-path</br-option>, disable backup from standby - {[db-path-upgrade]} - {[db-path-upgrade]} + {[pg-path-upgrade]} + {[pg-path-upgrade]} n - + Copy hba configuration @@ -2502,7 +2530,7 @@ Upgrade the stanza - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} {[dash]}-no-online {[dash]}-log-level-console=info stanza-upgrade completed successfully @@ -2511,21 +2539,21 @@

Start the new cluster and confirm it is successfully installed.

- + Start new cluster - {[db-cluster-start-upgrade]} + {[pg-cluster-start-upgrade]}

Test configuration using the check command.

- + Check configuration - {[db-cluster-check-upgrade]} + {[pg-cluster-check-upgrade]} @@ -2535,7 +2563,7 @@

Remove the old cluster.

- + Remove old cluster @@ -2543,13 +2571,13 @@ - rm -rf {[db-path]} + rm -rf {[pg-path]}

Install the new binaries on the standby and create the cluster.

- + Remove old cluster and create the new cluster @@ -2557,7 +2585,7 @@ - rm -rf {[db-path]} + rm -rf {[pg-path]} @@ -2567,7 +2595,7 @@ - {[db-cluster-create-upgrade]} + {[pg-cluster-create-upgrade]} @@ -2576,7 +2604,7 @@ Check configuration - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} check @@ -2586,12 +2614,12 @@ Run a full backup - + {[project-exe]} {[dash]}-stanza={[postgres-cluster-demo]} {[dash]}-type=full backup - + Restore the {[postgres-cluster-demo]} standby cluster @@ -2603,21 +2631,21 @@ - + Configure <postgres/> on - + Start <postgres/> and check the <backrest/> configuration - {[db-cluster-start-upgrade]} + {[pg-cluster-start-upgrade]} - {[db-cluster-wait]} + {[pg-cluster-wait]} @@ -2627,7 +2655,7 @@

Backup from standby can be enabled now that the standby is restored.

- + Reenable backup from standby y diff --git a/lib/pgBackRest/Archive/Common.pm b/lib/pgBackRest/Archive/Common.pm index 2bf13d152..94193f908 100644 --- a/lib/pgBackRest/Archive/Common.pm +++ b/lib/pgBackRest/Archive/Common.pm @@ -357,7 +357,7 @@ sub walPath if (!defined($strDbPath)) { confess &log(ERROR, - "option 'db-path' must be specified when relative wal paths are used\n" . + "option '" . cfgOptionName(CFGOPT_PG_PATH) . "' must be specified when relative wal paths are used\n" . "HINT: Is \%f passed to ${strCommand} instead of \%p?\n" . "HINT: PostgreSQL may pass relative paths even with \%p depending on the environment.", ERROR_OPTION_REQUIRED); diff --git a/lib/pgBackRest/Archive/Get/Get.pm b/lib/pgBackRest/Archive/Get/Get.pm index 1cf744d20..3af25462a 100644 --- a/lib/pgBackRest/Archive/Get/Get.pm +++ b/lib/pgBackRest/Archive/Get/Get.pm @@ -108,7 +108,7 @@ sub get my $oStorageRepo = storageRepo(); # Construct absolute path to the WAL file when it is relative - $strDestinationFile = walPath($strDestinationFile, cfgOption(CFGOPT_DB_PATH, false), cfgCommandName(cfgCommandGet())); + $strDestinationFile = walPath($strDestinationFile, cfgOption(CFGOPT_PG_PATH, false), cfgCommandName(cfgCommandGet())); # Get the wal segment filename my ($strArchiveId, $strArchiveFile, $strCipherPass) = $self->getCheck(undef, undef, $strSourceArchive, false); @@ -153,7 +153,7 @@ sub get #################################################################################################################################### # getArchiveId # -# CAUTION: Only to be used by commands where the DB Version and DB System ID are not important such that the db-path is not valid +# CAUTION: Only to be used by commands where the DB Version and DB System ID are not important such that the pg-path is not valid # for the command (i.e. expire command). Since this function will not check validity of the database version call getCheck() # instead. #################################################################################################################################### diff --git a/lib/pgBackRest/Archive/Push/Push.pm b/lib/pgBackRest/Archive/Push/Push.pm index faa332ddf..601d859e5 100644 --- a/lib/pgBackRest/Archive/Push/Push.pm +++ b/lib/pgBackRest/Archive/Push/Push.pm @@ -68,7 +68,7 @@ sub process lockStopTest(); # Extract WAL path and file - my $strWalPath = dirname(walPath($strWalPathFile, cfgOption(CFGOPT_DB_PATH, false), cfgCommandName(cfgCommandGet()))); + my $strWalPath = dirname(walPath($strWalPathFile, cfgOption(CFGOPT_PG_PATH, false), cfgCommandName(cfgCommandGet()))); my $strWalFile = basename($strWalPathFile); # Start the async process and wait for WAL to complete diff --git a/lib/pgBackRest/Backup/Backup.pm b/lib/pgBackRest/Backup/Backup.pm index 683898e93..06be87f88 100644 --- a/lib/pgBackRest/Backup/Backup.pm +++ b/lib/pgBackRest/Backup/Backup.pm @@ -390,7 +390,7 @@ sub processManifest foreach my $hJob (@{$hyJob}) { ($lSizeCurrent, $lManifestSaveCurrent) = backupManifestUpdate( - $oBackupManifest, cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_HOST, $hJob->{iHostConfigIdx}), false), + $oBackupManifest, cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $hJob->{iHostConfigIdx}), false), $hJob->{iProcessId}, @{$hJob->{rParam}}[0..4], @{$hJob->{rResult}}, $lSizeTotal, $lSizeCurrent, $lManifestSaveSize, $lManifestSaveCurrent); } @@ -432,7 +432,7 @@ sub process # Store local type, compress, and hardlink options since they can be modified by the process my $strType = cfgOption(CFGOPT_TYPE); my $bCompress = cfgOption(CFGOPT_COMPRESS); - my $bHardLink = cfgOption(CFGOPT_HARDLINK); + my $bHardLink = cfgOption(CFGOPT_REPO_HARDLINK); # Create the cluster backup and history path $oStorageRepo->pathCreate( @@ -471,8 +471,8 @@ sub process my $oStorageDbMaster = storageDb({iRemoteIdx => $self->{iMasterRemoteIdx}}); # Determine the database paths - my $strDbMasterPath = cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $self->{iMasterRemoteIdx})); - my $strDbCopyPath = cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $self->{iCopyRemoteIdx})); + my $strDbMasterPath = cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $self->{iMasterRemoteIdx})); + my $strDbCopyPath = cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $self->{iCopyRemoteIdx})); # Database info my ($strDbVersion, $iControlVersion, $iCatalogVersion, $ullDbSysId) = $oDbMaster->info(); @@ -601,10 +601,10 @@ sub process } # Check hardlink elsif ($oAbortedManifest->boolGet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_HARDLINK) != - cfgOption(CFGOPT_HARDLINK)) + cfgOption(CFGOPT_REPO_HARDLINK)) { $strKey = MANIFEST_KEY_HARDLINK; - $strValueNew = cfgOption(CFGOPT_HARDLINK); + $strValueNew = cfgOption(CFGOPT_REPO_HARDLINK); $strValueAborted = $oAbortedManifest->boolGet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_HARDLINK); } diff --git a/lib/pgBackRest/Check/Check.pm b/lib/pgBackRest/Check/Check.pm index 1d47d6ee6..df0f63d7b 100644 --- a/lib/pgBackRest/Check/Check.pm +++ b/lib/pgBackRest/Check/Check.pm @@ -75,11 +75,11 @@ sub process logLevelSet(undef, OFF); # Loop through all defined databases and attempt to build a manifest - for (my $iRemoteIdx = 1; $iRemoteIdx <= cfgOptionIndexTotal(CFGOPT_DB_HOST); $iRemoteIdx++) + for (my $iRemoteIdx = 1; $iRemoteIdx <= cfgOptionIndexTotal(CFGOPT_PG_HOST); $iRemoteIdx++) { # Make sure a db is defined for this index - if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iRemoteIdx)) || - cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_HOST, $iRemoteIdx))) + if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iRemoteIdx)) || + cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iRemoteIdx))) { eval { @@ -91,7 +91,7 @@ sub process strCipherPassSub => 'x'}); $oBackupManifest->build(storageDb({iRemoteIdx => $iRemoteIdx}), - cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iRemoteIdx)), undef, cfgOption(CFGOPT_ONLINE)); + cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iRemoteIdx)), undef, cfgOption(CFGOPT_ONLINE)); return true; } diff --git a/lib/pgBackRest/Config/Config.pm b/lib/pgBackRest/Config/Config.pm index ca4c64fa4..7a42a26df 100644 --- a/lib/pgBackRest/Config/Config.pm +++ b/lib/pgBackRest/Config/Config.pm @@ -171,23 +171,24 @@ sub configLoad umask(0000); } - # Set db-cmd and backup-cmd to defaults if they are not set. The command depends on the currently running exe so can't be - # calculated correctly in the C Library -- perhaps in the future this value will be passed in or set some other way - if (cfgOptionValid(CFGOPT_BACKUP_CMD) && cfgOptionTest(CFGOPT_BACKUP_HOST) && !cfgOptionTest(CFGOPT_BACKUP_CMD)) + # Set pg-host-cmd and repo-host-cmd to defaults if they are not set. The command depends on the currently running exe so can't + # be calculated correctly in the C Library -- perhaps in the future this value will be passed in or set some other way + # ??? THIS IS IMPLEMENTED IN C AND SHOULD BE REMOVED FROM HERE WITHOUT DUPLICATING TEST CODE + if (cfgOptionValid(CFGOPT_REPO_HOST_CMD) && cfgOptionTest(CFGOPT_REPO_HOST) && !cfgOptionTest(CFGOPT_REPO_HOST_CMD)) { - cfgOptionSet(CFGOPT_BACKUP_CMD, backrestBin()); - $oOption{cfgOptionName(CFGOPT_BACKUP_CMD)}{source} = CFGDEF_SOURCE_DEFAULT; + cfgOptionSet(CFGOPT_REPO_HOST_CMD, backrestBin()); + $oOption{cfgOptionName(CFGOPT_REPO_HOST_CMD)}{source} = CFGDEF_SOURCE_DEFAULT; } - if (cfgOptionValid(CFGOPT_DB_CMD)) + if (cfgOptionValid(CFGOPT_PG_HOST_CMD)) { - for (my $iOptionIdx = 1; $iOptionIdx <= cfgOptionIndexTotal(CFGOPT_DB_HOST); $iOptionIdx++) + for (my $iOptionIdx = 1; $iOptionIdx <= cfgOptionIndexTotal(CFGOPT_PG_HOST); $iOptionIdx++) { - if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_HOST, $iOptionIdx)) && - !cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_CMD, $iOptionIdx))) + if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iOptionIdx)) && + !cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, $iOptionIdx))) { - cfgOptionSet(cfgOptionIdFromIndex(CFGOPT_DB_CMD, $iOptionIdx), backrestBin()); - $oOption{cfgOptionIdFromIndex(CFGOPT_DB_CMD, $iOptionIdx)}{source} = CFGDEF_SOURCE_DEFAULT; + cfgOptionSet(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, $iOptionIdx), backrestBin()); + $oOption{cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, $iOptionIdx)}{source} = CFGDEF_SOURCE_DEFAULT; } } } @@ -213,7 +214,7 @@ sub configLoad } # Make sure that backup and db are not both remote - if (cfgOptionTest(CFGOPT_DB_HOST) && cfgOptionTest(CFGOPT_BACKUP_HOST)) + if (cfgOptionTest(CFGOPT_PG_HOST) && cfgOptionTest(CFGOPT_REPO_HOST)) { confess &log(ERROR, 'db and backup cannot both be configured as remote', ERROR_CONFIG); } @@ -290,13 +291,12 @@ sub configLoad push @EXPORT, qw(configLoad); #################################################################################################################################### -# cfgOptionIdFromIndex - return name for options that can be indexed (e.g. db1-host, db2-host). +# cfgOptionIdFromIndex - return name for options that can be indexed (e.g. pg1-host, pg2-host). #################################################################################################################################### sub cfgOptionIdFromIndex { my $iOptionId = shift; my $iIndex = shift; - my $bForce = shift; # If the option doesn't have a prefix it can't be indexed $iIndex = defined($iIndex) ? $iIndex : 1; diff --git a/lib/pgBackRest/Db.pm b/lib/pgBackRest/Db.pm index f4eaddd04..98bcbd3a9 100644 --- a/lib/pgBackRest/Db.pm +++ b/lib/pgBackRest/Db.pm @@ -89,7 +89,7 @@ sub new if (defined($self->{iRemoteIdx})) { - $self->{strDbPath} = cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $self->{iRemoteIdx})); + $self->{strDbPath} = cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $self->{iRemoteIdx})); if (!isDbLocal({iRemoteIdx => $self->{iRemoteIdx}})) { @@ -161,18 +161,18 @@ sub connect # Connect to the db my $strDbName = 'postgres'; my $strDbUser = getpwuid($<); - my $strDbSocketPath = cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_SOCKET_PATH, $self->{iRemoteIdx}), false); + my $strDbSocketPath = cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_SOCKET_PATH, $self->{iRemoteIdx}), false); # Make sure the socket path is absolute if (defined($strDbSocketPath) && $strDbSocketPath !~ /^\//) { - confess &log(ERROR, "'${strDbSocketPath}' is not valid for '" . cfgOptionName(CFGOPT_DB_SOCKET_PATH) . "' option:" . + confess &log(ERROR, "'${strDbSocketPath}' is not valid for '" . cfgOptionName(CFGOPT_PG_SOCKET_PATH) . "' option:" . " path must be absolute", ERROR_OPTION_INVALID_VALUE); } # Construct the URI my $strDbUri = - "dbi:Pg:dbname=${strDbName};port=" . cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PORT, $self->{iRemoteIdx})) . + "dbi:Pg:dbname=${strDbName};port=" . cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PORT, $self->{iRemoteIdx})) . (defined($strDbSocketPath) ? ";host=${strDbSocketPath}" : ''); logDebugMisc @@ -556,7 +556,7 @@ sub versionGet return $self->{strDbVersion}, $self->{strDbPath}; } - # Get version and db-path from + # Get version and pg-path from (my $strVersionNum, $self->{strDbPath}) = $self->executeSqlRow( "select (select setting from pg_settings where name = 'server_version_num'), " . @@ -758,13 +758,15 @@ sub configValidate # Get version and db path from the database my ($fCompareDbVersion, $strCompareDbPath) = $self->versionGet(); - # Error if the version from the control file and the configured db-path do not match the values obtained from the database + # Error if the version from the control file and the configured pg-path do not match the values obtained from the database if (!($strDbVersion == $fCompareDbVersion && $self->{strDbPath} eq $strCompareDbPath)) { confess &log(ERROR, - "version '${fCompareDbVersion}' and db-path '${strCompareDbPath}' queried from cluster does not match" . - " version '${strDbVersion}' and db-path '$self->{strDbPath}' read from '$self->{strDbPath}/" . - DB_FILE_PGCONTROL . "'\n" . "HINT: the db-path and db-port settings likely reference different clusters", + "version '${fCompareDbVersion}' and path '${strCompareDbPath}' queried from cluster do not match version" . + " '${strDbVersion}' and " . cfgOptionName(CFGOPT_PG_PATH) . " '$self->{strDbPath}' read from" . + " '$self->{strDbPath}/" . DB_FILE_PGCONTROL . "'\n" . + "HINT: the " . cfgOptionName(CFGOPT_PG_PATH) . " and " . cfgOptionName(CFGOPT_PG_PORT) . + " settings likely reference different clusters", ERROR_DB_MISMATCH); } @@ -1030,11 +1032,11 @@ sub dbObjectGet # this is simple and works. if (!$bMasterOnly && cfgOptionTest(CFGOPT_ONLINE) && cfgOption(CFGOPT_ONLINE) && multipleDb()) { - for (my $iRemoteIdx = 1; $iRemoteIdx <= cfgOptionIndexTotal(CFGOPT_DB_HOST); $iRemoteIdx++) + for (my $iRemoteIdx = 1; $iRemoteIdx <= cfgOptionIndexTotal(CFGOPT_PG_HOST); $iRemoteIdx++) { # Make sure a db is defined for this index - if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iRemoteIdx)) || - cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_HOST, $iRemoteIdx))) + if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iRemoteIdx)) || + cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iRemoteIdx))) { # Create the db object my $oDb; @@ -1155,10 +1157,10 @@ push @EXPORT, qw(dbMasterGet); #################################################################################################################################### sub multipleDb { - for (my $iDbPathIdx = 2; $iDbPathIdx <= cfgOptionIndexTotal(CFGOPT_DB_PATH); $iDbPathIdx++) + for (my $iDbPathIdx = 2; $iDbPathIdx <= cfgOptionIndexTotal(CFGOPT_PG_PATH); $iDbPathIdx++) { # If an index exists above 1 then return true - if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iDbPathIdx))) + if (cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iDbPathIdx))) { return true; } diff --git a/lib/pgBackRest/Main.pm b/lib/pgBackRest/Main.pm index 83d14a5a3..e134b4bec 100644 --- a/lib/pgBackRest/Main.pm +++ b/lib/pgBackRest/Main.pm @@ -87,7 +87,9 @@ sub main !cfgOptionTest(CFGOPT_REPO_TYPE, CFGOPTVAL_REPO_TYPE_S3) && !-e cfgOption(CFGOPT_REPO_PATH)) { - confess &log(ERROR, 'repo-path \'' . cfgOption(CFGOPT_REPO_PATH) . '\' does not exist', ERROR_PATH_MISSING); + confess &log(ERROR, + cfgOptionName(CFGOPT_REPO_PATH) . ' \'' . cfgOption(CFGOPT_REPO_PATH) . '\' does not exist', + ERROR_PATH_MISSING); } # Load module dynamically @@ -166,7 +168,8 @@ sub main if (isRepoLocal() && !cfgOptionTest(CFGOPT_REPO_TYPE, CFGOPTVAL_REPO_TYPE_S3) && !storageRepo()->pathExists('')) { - confess &log(ERROR, 'repo-path \'' . cfgOption(CFGOPT_REPO_PATH) . '\' does not exist', ERROR_PATH_MISSING); + confess &log(ERROR, + cfgOptionName(CFGOPT_REPO_PATH) . ' \'' . cfgOption(CFGOPT_REPO_PATH) . '\' does not exist', ERROR_PATH_MISSING); } ############################################################################################################################ diff --git a/lib/pgBackRest/Manifest.pm b/lib/pgBackRest/Manifest.pm index b2ba08751..6de6558ec 100644 --- a/lib/pgBackRest/Manifest.pm +++ b/lib/pgBackRest/Manifest.pm @@ -98,7 +98,7 @@ use constant MANIFEST_KEY_TYPE => 'backup-t # Options that were set when the backup was made use constant MANIFEST_KEY_BACKUP_STANDBY => 'option-' . cfgOptionName(CFGOPT_BACKUP_STANDBY); push @EXPORT, qw(MANIFEST_KEY_BACKUP_STANDBY); -use constant MANIFEST_KEY_HARDLINK => 'option-' . cfgOptionName(CFGOPT_HARDLINK); +use constant MANIFEST_KEY_HARDLINK => 'option-hardlink'; push @EXPORT, qw(MANIFEST_KEY_HARDLINK); use constant MANIFEST_KEY_ARCHIVE_CHECK => 'option-' . cfgOptionName(CFGOPT_ARCHIVE_CHECK); push @EXPORT, qw(MANIFEST_KEY_ARCHIVE_CHECK); diff --git a/lib/pgBackRest/Protocol/Helper.pm b/lib/pgBackRest/Protocol/Helper.pm index 885ef6296..1197eed9c 100644 --- a/lib/pgBackRest/Protocol/Helper.pm +++ b/lib/pgBackRest/Protocol/Helper.pm @@ -98,7 +98,7 @@ sub isRepoLocal confess &log(ASSERT, 'isRepoLocal() not valid on ' . cfgOption(CFGOPT_TYPE) . ' remote'); } - return cfgOptionTest(CFGOPT_BACKUP_HOST) ? false : true; + return cfgOptionTest(CFGOPT_REPO_HOST) ? false : true; } push @EXPORT, qw(isRepoLocal); @@ -127,7 +127,7 @@ sub isDbLocal confess &log(ASSERT, 'isDbLocal() not valid on ' . cfgOption(CFGOPT_TYPE) . ' remote'); } - my $bLocal = cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_DB_HOST, $iRemoteIdx)) ? false : true; + my $bLocal = cfgOptionTest(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iRemoteIdx)) ? false : true; # Return from function and log return values if any return logDebugReturn @@ -165,46 +165,46 @@ sub protocolParam ); # Return the remote when required - my $iOptionIdCmd = CFGOPT_BACKUP_CMD; - my $iOptionIdConfig = CFGOPT_BACKUP_CONFIG; - my $iOptionIdHost = CFGOPT_BACKUP_HOST; - my $iOptionIdUser = CFGOPT_BACKUP_USER; + my $iOptionIdCmd = CFGOPT_REPO_HOST_CMD; + my $iOptionIdConfig = CFGOPT_REPO_HOST_CONFIG; + my $iOptionIdHost = CFGOPT_REPO_HOST; + my $iOptionIdUser = CFGOPT_REPO_HOST_USER; my $strOptionDbPath = undef; my $strOptionDbPort = undef; my $strOptionDbSocketPath = undef; - my $strOptionSshPort = CFGOPT_BACKUP_SSH_PORT; + my $strOptionSshPort = CFGOPT_REPO_HOST_PORT; if ($strRemoteType eq CFGOPTVAL_REMOTE_TYPE_DB) { - $iOptionIdCmd = cfgOptionIdFromIndex(CFGOPT_DB_CMD, $iRemoteIdx); - $iOptionIdConfig = cfgOptionIdFromIndex(CFGOPT_DB_CONFIG, $iRemoteIdx); - $iOptionIdHost = cfgOptionIdFromIndex(CFGOPT_DB_HOST, $iRemoteIdx); - $iOptionIdUser = cfgOptionIdFromIndex(CFGOPT_DB_USER, $iRemoteIdx); - $strOptionSshPort = cfgOptionIdFromIndex(CFGOPT_DB_SSH_PORT, $iRemoteIdx); + $iOptionIdCmd = cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, $iRemoteIdx); + $iOptionIdConfig = cfgOptionIdFromIndex(CFGOPT_PG_HOST_CONFIG, $iRemoteIdx); + $iOptionIdHost = cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iRemoteIdx); + $iOptionIdUser = cfgOptionIdFromIndex(CFGOPT_PG_HOST_USER, $iRemoteIdx); + $strOptionSshPort = cfgOptionIdFromIndex(CFGOPT_PG_HOST_PORT, $iRemoteIdx); } # Db path is not valid in all contexts (restore, for instance) - if (cfgOptionValid(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iRemoteIdx))) + if (cfgOptionValid(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iRemoteIdx))) { $strOptionDbPath = - cfgOptionSource(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iRemoteIdx)) eq CFGDEF_SOURCE_DEFAULT ? - undef : cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iRemoteIdx)); + cfgOptionSource(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iRemoteIdx)) eq CFGDEF_SOURCE_DEFAULT ? + undef : cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iRemoteIdx)); } # Db port is not valid in all contexts (restore, for instance) - if (cfgOptionValid(cfgOptionIdFromIndex(CFGOPT_DB_PORT, $iRemoteIdx))) + if (cfgOptionValid(cfgOptionIdFromIndex(CFGOPT_PG_PORT, $iRemoteIdx))) { $strOptionDbPort = - cfgOptionSource(cfgOptionIdFromIndex(CFGOPT_DB_PORT, $iRemoteIdx)) eq CFGDEF_SOURCE_DEFAULT ? - undef : cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PORT, $iRemoteIdx)); + cfgOptionSource(cfgOptionIdFromIndex(CFGOPT_PG_PORT, $iRemoteIdx)) eq CFGDEF_SOURCE_DEFAULT ? + undef : cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PORT, $iRemoteIdx)); } # Db socket is not valid in all contexts (restore, for instance) - if (cfgOptionValid(cfgOptionIdFromIndex(CFGOPT_DB_SOCKET_PATH, $iRemoteIdx))) + if (cfgOptionValid(cfgOptionIdFromIndex(CFGOPT_PG_SOCKET_PATH, $iRemoteIdx))) { $strOptionDbSocketPath = - cfgOptionSource(cfgOptionIdFromIndex(CFGOPT_DB_SOCKET_PATH, $iRemoteIdx)) eq CFGDEF_SOURCE_DEFAULT ? - undef : cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_SOCKET_PATH, $iRemoteIdx)); + cfgOptionSource(cfgOptionIdFromIndex(CFGOPT_PG_SOCKET_PATH, $iRemoteIdx)) eq CFGDEF_SOURCE_DEFAULT ? + undef : cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_SOCKET_PATH, $iRemoteIdx)); } # Build hash to set and override command options @@ -223,9 +223,9 @@ sub protocolParam # option will be set to 'protocol' which is not a valid value from the command line. &CFGOPT_LOG_LEVEL_STDERR => {}, - cfgOptionIdFromIndex(CFGOPT_DB_PATH, 1) => {value => $strOptionDbPath}, - cfgOptionIdFromIndex(CFGOPT_DB_PORT, 1) => {value => $strOptionDbPort}, - cfgOptionIdFromIndex(CFGOPT_DB_SOCKET_PATH, 1) => {value => $strOptionDbSocketPath}, + cfgOptionIdFromIndex(CFGOPT_PG_PATH, 1) => {value => $strOptionDbPath}, + cfgOptionIdFromIndex(CFGOPT_PG_PORT, 1) => {value => $strOptionDbPort}, + cfgOptionIdFromIndex(CFGOPT_PG_SOCKET_PATH, 1) => {value => $strOptionDbSocketPath}, # Set protocol options explicitly so values are not picked up from remote config files &CFGOPT_BUFFER_SIZE => {value => cfgOption(CFGOPT_BUFFER_SIZE)}, @@ -236,20 +236,20 @@ sub protocolParam # Override some per-db options that shouldn't be passed to the command. ??? This could be done better as a new define # for these options which would then be implemented in cfgCommandWrite(). - for (my $iOptionIdx = 1; $iOptionIdx <= cfgOptionIndexTotal(CFGOPT_DB_HOST); $iOptionIdx++) + for (my $iOptionIdx = 1; $iOptionIdx <= cfgOptionIndexTotal(CFGOPT_PG_HOST); $iOptionIdx++) { if ($iOptionIdx != 1) { - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_CONFIG, $iOptionIdx)} = {}; - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_HOST, $iOptionIdx)} = {}; - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iOptionIdx)} = {}; - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_PORT, $iOptionIdx)} = {}; - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_SOCKET_PATH, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_HOST_CONFIG, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_PORT, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_SOCKET_PATH, $iOptionIdx)} = {}; } - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_CMD, $iOptionIdx)} = {}; - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_USER, $iOptionIdx)} = {}; - $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_DB_SSH_PORT, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_HOST_USER, $iOptionIdx)} = {}; + $rhCommandOption->{cfgOptionIdFromIndex(CFGOPT_PG_HOST_PORT, $iOptionIdx)} = {}; } # Generate the remote command @@ -302,7 +302,7 @@ sub protocolGet # If no remote requested or if the requested remote type is local then return a local protocol object if (!cfgOptionTest( - cfgOptionIdFromIndex($strRemoteType eq CFGOPTVAL_REMOTE_TYPE_DB ? CFGOPT_DB_HOST : CFGOPT_BACKUP_HOST, $iRemoteIdx))) + cfgOptionIdFromIndex($strRemoteType eq CFGOPTVAL_REMOTE_TYPE_DB ? CFGOPT_PG_HOST : CFGOPT_REPO_HOST, $iRemoteIdx))) { confess &log(ASSERT, 'protocol cannot be created when remote host is not specified'); } diff --git a/lib/pgBackRest/Protocol/Storage/Helper.pm b/lib/pgBackRest/Protocol/Storage/Helper.pm index 43351e0b1..7e03319da 100644 --- a/lib/pgBackRest/Protocol/Storage/Helper.pm +++ b/lib/pgBackRest/Protocol/Storage/Helper.pm @@ -61,7 +61,7 @@ sub storageDb if (isDbLocal({iRemoteIdx => $iRemoteIdx})) { $hStorage->{&STORAGE_DB}{$iRemoteIdx} = new pgBackRest::Storage::Local( - cfgOption(cfgOptionIdFromIndex(CFGOPT_DB_PATH, $iRemoteIdx)), new pgBackRest::Storage::Posix::Driver(), + cfgOption(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iRemoteIdx)), new pgBackRest::Storage::Posix::Driver(), {strTempExtension => STORAGE_TEMP_EXT, lBufferMax => cfgOption(CFGOPT_BUFFER_SIZE)}); } else diff --git a/lib/pgBackRest/Restore.pm b/lib/pgBackRest/Restore.pm index 498027ed5..42aaf19ab 100644 --- a/lib/pgBackRest/Restore.pm +++ b/lib/pgBackRest/Restore.pm @@ -43,7 +43,7 @@ sub new $self->{oProtocol} = !isRepoLocal() ? protocolGet(CFGOPTVAL_REMOTE_TYPE_BACKUP) : undef; # Initialize variables - $self->{strDbClusterPath} = cfgOption(CFGOPT_DB_PATH); + $self->{strDbClusterPath} = cfgOption(CFGOPT_PG_PATH); $self->{strBackupSet} = cfgOption(CFGOPT_SET); # Return from function and log return values if any diff --git a/lib/pgBackRest/Stanza.pm b/lib/pgBackRest/Stanza.pm index 7b30214ea..86558963a 100644 --- a/lib/pgBackRest/Stanza.pm +++ b/lib/pgBackRest/Stanza.pm @@ -730,7 +730,7 @@ sub dbInfoGet # postgres logs. if (cfgOption(CFGOPT_ONLINE)) { - # If the db-path in pgbackrest.conf does not match the pg_control then this will error alert the user to fix pgbackrest.conf + # If the pg-path in pgbackrest.conf does not match the pg_control then this will error alert the user to fix pgbackrest.conf $self->{oDb}->configValidate(); } diff --git a/libc/build/lib/pgBackRestLibC/Build.pm b/libc/build/lib/pgBackRestLibC/Build.pm index 4b96a03ee..18d696392 100644 --- a/libc/build/lib/pgBackRestLibC/Build.pm +++ b/libc/build/lib/pgBackRestLibC/Build.pm @@ -87,7 +87,6 @@ my $rhExport = cfgDefOptionDependValue cfgDefOptionDependValueTotal cfgDefOptionDependValueValid - cfgDefOptionNameAlt cfgDefOptionNegate cfgDefOptionPrefix cfgDefOptionRequired diff --git a/libc/lib/pgBackRest/LibCAuto.pm b/libc/lib/pgBackRest/LibCAuto.pm index 06d9120e2..840fab7f3 100644 --- a/libc/lib/pgBackRest/LibCAuto.pm +++ b/libc/lib/pgBackRest/LibCAuto.pm @@ -120,12 +120,7 @@ sub libcAutoExportTag 'CFGOPT_ARCHIVE_COPY', 'CFGOPT_ARCHIVE_QUEUE_MAX', 'CFGOPT_ARCHIVE_TIMEOUT', - 'CFGOPT_BACKUP_CMD', - 'CFGOPT_BACKUP_CONFIG', - 'CFGOPT_BACKUP_HOST', - 'CFGOPT_BACKUP_SSH_PORT', 'CFGOPT_BACKUP_STANDBY', - 'CFGOPT_BACKUP_USER', 'CFGOPT_BUFFER_SIZE', 'CFGOPT_CHECKSUM_PAGE', 'CFGOPT_CMD_SSH', @@ -134,19 +129,10 @@ sub libcAutoExportTag 'CFGOPT_COMPRESS_LEVEL', 'CFGOPT_COMPRESS_LEVEL_NETWORK', 'CFGOPT_CONFIG', - 'CFGOPT_DB_CMD', - 'CFGOPT_DB_CONFIG', - 'CFGOPT_DB_HOST', 'CFGOPT_DB_INCLUDE', - 'CFGOPT_DB_PATH', - 'CFGOPT_DB_PORT', - 'CFGOPT_DB_SOCKET_PATH', - 'CFGOPT_DB_SSH_PORT', 'CFGOPT_DB_TIMEOUT', - 'CFGOPT_DB_USER', 'CFGOPT_DELTA', 'CFGOPT_FORCE', - 'CFGOPT_HARDLINK', 'CFGOPT_HOST_ID', 'CFGOPT_LINK_ALL', 'CFGOPT_LINK_MAP', @@ -162,12 +148,26 @@ sub libcAutoExportTag 'CFGOPT_OUTPUT', 'CFGOPT_PERL_BIN', 'CFGOPT_PERL_OPTION', + 'CFGOPT_PG_HOST', + 'CFGOPT_PG_HOST_CMD', + 'CFGOPT_PG_HOST_CONFIG', + 'CFGOPT_PG_HOST_PORT', + 'CFGOPT_PG_HOST_USER', + 'CFGOPT_PG_PATH', + 'CFGOPT_PG_PORT', + 'CFGOPT_PG_SOCKET_PATH', 'CFGOPT_PROCESS', 'CFGOPT_PROCESS_MAX', 'CFGOPT_PROTOCOL_TIMEOUT', 'CFGOPT_RECOVERY_OPTION', 'CFGOPT_REPO_CIPHER_PASS', 'CFGOPT_REPO_CIPHER_TYPE', + 'CFGOPT_REPO_HARDLINK', + 'CFGOPT_REPO_HOST', + 'CFGOPT_REPO_HOST_CMD', + 'CFGOPT_REPO_HOST_CONFIG', + 'CFGOPT_REPO_HOST_PORT', + 'CFGOPT_REPO_HOST_USER', 'CFGOPT_REPO_PATH', 'CFGOPT_REPO_S3_BUCKET', 'CFGOPT_REPO_S3_CA_FILE', @@ -227,7 +227,6 @@ sub libcAutoExportTag 'cfgDefOptionDependValue', 'cfgDefOptionDependValueTotal', 'cfgDefOptionDependValueValid', - 'cfgDefOptionNameAlt', 'cfgDefOptionNegate', 'cfgDefOptionPrefix', 'cfgDefOptionRequired', diff --git a/libc/xs/config/config.auto.xsh b/libc/xs/config/config.auto.xsh index bc654f8ab..741f0f75b 100644 --- a/libc/xs/config/config.auto.xsh +++ b/libc/xs/config/config.auto.xsh @@ -34,12 +34,7 @@ Option constants #define CFGOPT_ARCHIVE_COPY cfgOptArchiveCopy #define CFGOPT_ARCHIVE_QUEUE_MAX cfgOptArchiveQueueMax #define CFGOPT_ARCHIVE_TIMEOUT cfgOptArchiveTimeout -#define CFGOPT_BACKUP_CMD cfgOptBackupCmd -#define CFGOPT_BACKUP_CONFIG cfgOptBackupConfig -#define CFGOPT_BACKUP_HOST cfgOptBackupHost -#define CFGOPT_BACKUP_SSH_PORT cfgOptBackupSshPort #define CFGOPT_BACKUP_STANDBY cfgOptBackupStandby -#define CFGOPT_BACKUP_USER cfgOptBackupUser #define CFGOPT_BUFFER_SIZE cfgOptBufferSize #define CFGOPT_CHECKSUM_PAGE cfgOptChecksumPage #define CFGOPT_CMD_SSH cfgOptCmdSsh @@ -48,19 +43,10 @@ Option constants #define CFGOPT_COMPRESS_LEVEL cfgOptCompressLevel #define CFGOPT_COMPRESS_LEVEL_NETWORK cfgOptCompressLevelNetwork #define CFGOPT_CONFIG cfgOptConfig -#define CFGOPT_DB_CMD cfgOptDbCmd -#define CFGOPT_DB_CONFIG cfgOptDbConfig -#define CFGOPT_DB_HOST cfgOptDbHost #define CFGOPT_DB_INCLUDE cfgOptDbInclude -#define CFGOPT_DB_PATH cfgOptDbPath -#define CFGOPT_DB_PORT cfgOptDbPort -#define CFGOPT_DB_SOCKET_PATH cfgOptDbSocketPath -#define CFGOPT_DB_SSH_PORT cfgOptDbSshPort #define CFGOPT_DB_TIMEOUT cfgOptDbTimeout -#define CFGOPT_DB_USER cfgOptDbUser #define CFGOPT_DELTA cfgOptDelta #define CFGOPT_FORCE cfgOptForce -#define CFGOPT_HARDLINK cfgOptHardlink #define CFGOPT_HOST_ID cfgOptHostId #define CFGOPT_LINK_ALL cfgOptLinkAll #define CFGOPT_LINK_MAP cfgOptLinkMap @@ -76,12 +62,26 @@ Option constants #define CFGOPT_OUTPUT cfgOptOutput #define CFGOPT_PERL_BIN cfgOptPerlBin #define CFGOPT_PERL_OPTION cfgOptPerlOption +#define CFGOPT_PG_HOST cfgOptPgHost +#define CFGOPT_PG_HOST_CMD cfgOptPgHostCmd +#define CFGOPT_PG_HOST_CONFIG cfgOptPgHostConfig +#define CFGOPT_PG_HOST_PORT cfgOptPgHostPort +#define CFGOPT_PG_HOST_USER cfgOptPgHostUser +#define CFGOPT_PG_PATH cfgOptPgPath +#define CFGOPT_PG_PORT cfgOptPgPort +#define CFGOPT_PG_SOCKET_PATH cfgOptPgSocketPath #define CFGOPT_PROCESS cfgOptProcess #define CFGOPT_PROCESS_MAX cfgOptProcessMax #define CFGOPT_PROTOCOL_TIMEOUT cfgOptProtocolTimeout #define CFGOPT_RECOVERY_OPTION cfgOptRecoveryOption #define CFGOPT_REPO_CIPHER_PASS cfgOptRepoCipherPass #define CFGOPT_REPO_CIPHER_TYPE cfgOptRepoCipherType +#define CFGOPT_REPO_HARDLINK cfgOptRepoHardlink +#define CFGOPT_REPO_HOST cfgOptRepoHost +#define CFGOPT_REPO_HOST_CMD cfgOptRepoHostCmd +#define CFGOPT_REPO_HOST_CONFIG cfgOptRepoHostConfig +#define CFGOPT_REPO_HOST_PORT cfgOptRepoHostPort +#define CFGOPT_REPO_HOST_USER cfgOptRepoHostUser #define CFGOPT_REPO_PATH cfgOptRepoPath #define CFGOPT_REPO_S3_BUCKET cfgOptRepoS3Bucket #define CFGOPT_REPO_S3_CA_FILE cfgOptRepoS3CaFile diff --git a/libc/xs/config/define.xs b/libc/xs/config/define.xs index 094401328..8d476ba2b 100644 --- a/libc/xs/config/define.xs +++ b/libc/xs/config/define.xs @@ -233,23 +233,6 @@ CODE: OUTPUT: RETVAL -const char * -cfgDefOptionNameAlt(optionId) - U32 optionId -CODE: - RETVAL = NULL; - - ERROR_XS_BEGIN() - { - if (cfgOptionIndexTotal(optionId) > 1 && cfgOptionIndex(optionId) == 0) - RETVAL = cfgDefOptionName(cfgOptionDefIdFromId(optionId)); - else - RETVAL = cfgDefOptionNameAlt(cfgOptionDefIdFromId(optionId)); - } - ERROR_XS_END(); -OUTPUT: - RETVAL - bool cfgDefOptionNegate(optionId) U32 optionId CODE: diff --git a/src/command/help/help.c b/src/command/help/help.c index 370556b7e..0eb794de3 100644 --- a/src/command/help/help.c +++ b/src/command/help/help.c @@ -255,12 +255,17 @@ helpRender() // Ensure the option is valid const char *optionName = strPtr(strLstGet(cfgCommandParam(), 0)); + ConfigOption optionId = cfgOptionId(optionName); if (cfgOptionId(optionName) == -1) - THROW(OptionInvalidError, "option '%s' is not valid for command '%s'", optionName, commandName); + { + if (cfgDefOptionId(optionName) != -1) + optionId = cfgOptionIdFromDefId(cfgDefOptionId(optionName), 0); + else + THROW(OptionInvalidError, "option '%s' is not valid for command '%s'", optionName, commandName); + } // Output option summary and description - ConfigOption optionId = cfgOptionId(optionName); ConfigDefineOption optionDefId = cfgOptionDefIdFromId(optionId); strCatFmt( @@ -291,6 +296,27 @@ helpRender() if (defaultValue != NULL) strCatFmt(result, "default: %s\n", strPtr(defaultValue)); } + + // Output alternate names (call them deprecated so the user will know not to use them) + if (cfgDefOptionHelpNameAlt(optionDefId)) + { + strCat(result, "\ndeprecated name"); + + if (cfgDefOptionHelpNameAltValueTotal(optionDefId) > 1) + strCat(result, "s"); // {uncovered - no option has more than one alt name} + + strCat(result, ": "); + + for (int nameAltIdx = 0; nameAltIdx < cfgDefOptionHelpNameAltValueTotal(optionDefId); nameAltIdx++) + { + if (nameAltIdx != 0) + strCat(result, ", "); // {uncovered - no option has more than one alt name} + + strCat(result, cfgDefOptionHelpNameAltValue(optionDefId, nameAltIdx)); + } + + strCat(result, "\n"); + } } } diff --git a/src/config/config.auto.c b/src/config/config.auto.c index bce8f6f44..20892257a 100644 --- a/src/config/config.auto.c +++ b/src/config/config.auto.c @@ -135,38 +135,6 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveTimeout) ) - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("backup-cmd") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptBackupCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("backup-config") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptBackupConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("backup-host") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptBackupHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("backup-ssh-port") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptBackupSshPort) - ) - //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( @@ -175,14 +143,6 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST CONFIG_OPTION_DEFINE_ID(cfgDefOptBackupStandby) ) - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("backup-user") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptBackupUser) - ) - //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( @@ -247,198 +207,6 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST CONFIG_OPTION_DEFINE_ID(cfgDefOptConfig) ) - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-cmd") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-cmd") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-cmd") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-cmd") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-cmd") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-cmd") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-cmd") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-cmd") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbCmd) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-config") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-config") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-config") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-config") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-config") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-config") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-config") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-config") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbConfig) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-host") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-host") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-host") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-host") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-host") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-host") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-host") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-host") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbHost) - ) - //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( @@ -447,262 +215,6 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST CONFIG_OPTION_DEFINE_ID(cfgDefOptDbInclude) ) - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-path") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-path") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-path") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-path") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-path") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-path") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-path") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-path") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-port") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-port") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-port") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-port") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-port") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-port") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-port") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-port") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-socket-path") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-socket-path") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-socket-path") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-socket-path") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-socket-path") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-socket-path") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-socket-path") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-socket-path") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSocketPath) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-ssh-port") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-ssh-port") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-ssh-port") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-ssh-port") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-ssh-port") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-ssh-port") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-ssh-port") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-ssh-port") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbSshPort) - ) - //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( @@ -711,70 +223,6 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST CONFIG_OPTION_DEFINE_ID(cfgDefOptDbTimeout) ) - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db1-user") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db2-user") - CONFIG_OPTION_INDEX(1) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db3-user") - CONFIG_OPTION_INDEX(2) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db4-user") - CONFIG_OPTION_INDEX(3) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db5-user") - CONFIG_OPTION_INDEX(4) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db6-user") - CONFIG_OPTION_INDEX(5) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db7-user") - CONFIG_OPTION_INDEX(6) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("db8-user") - CONFIG_OPTION_INDEX(7) - CONFIG_OPTION_DEFINE_ID(cfgDefOptDbUser) - ) - //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( @@ -791,14 +239,6 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST CONFIG_OPTION_DEFINE_ID(cfgDefOptForce) ) - //------------------------------------------------------------------------------------------------------------------------------ - CONFIG_OPTION - ( - CONFIG_OPTION_NAME("hardlink") - CONFIG_OPTION_INDEX(0) - CONFIG_OPTION_DEFINE_ID(cfgDefOptHardlink) - ) - //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( @@ -919,6 +359,518 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST CONFIG_OPTION_DEFINE_ID(cfgDefOptPerlOption) ) + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-host") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-host") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-host") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-host") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-host") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-host") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-host") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-host") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-host-cmd") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-host-cmd") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-host-cmd") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-host-cmd") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-host-cmd") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-host-cmd") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-host-cmd") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-host-cmd") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-host-config") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-host-config") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-host-config") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-host-config") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-host-config") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-host-config") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-host-config") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-host-config") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-host-port") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-host-port") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-host-port") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-host-port") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-host-port") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-host-port") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-host-port") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-host-port") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-host-user") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-host-user") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-host-user") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-host-user") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-host-user") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-host-user") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-host-user") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-host-user") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-path") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-path") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-path") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-path") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-path") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-path") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-path") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-path") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-port") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-port") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-port") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-port") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-port") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-port") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-port") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-port") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg1-socket-path") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg2-socket-path") + CONFIG_OPTION_INDEX(1) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg3-socket-path") + CONFIG_OPTION_INDEX(2) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg4-socket-path") + CONFIG_OPTION_INDEX(3) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg5-socket-path") + CONFIG_OPTION_INDEX(4) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg6-socket-path") + CONFIG_OPTION_INDEX(5) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg7-socket-path") + CONFIG_OPTION_INDEX(6) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("pg8-socket-path") + CONFIG_OPTION_INDEX(7) + CONFIG_OPTION_DEFINE_ID(cfgDefOptPgSocketPath) + ) + //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( @@ -954,7 +906,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-cipher-pass") + CONFIG_OPTION_NAME("repo1-cipher-pass") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoCipherPass) ) @@ -962,7 +914,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-cipher-type") + CONFIG_OPTION_NAME("repo1-cipher-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoCipherType) ) @@ -970,7 +922,55 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-path") + CONFIG_OPTION_NAME("repo1-hardlink") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHardlink) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("repo1-host") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHost) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("repo1-host-cmd") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostCmd) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("repo1-host-config") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostConfig) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("repo1-host-port") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostPort) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("repo1-host-user") + CONFIG_OPTION_INDEX(0) + CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoHostUser) + ) + + //------------------------------------------------------------------------------------------------------------------------------ + CONFIG_OPTION + ( + CONFIG_OPTION_NAME("repo1-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoPath) ) @@ -978,7 +978,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-bucket") + CONFIG_OPTION_NAME("repo1-s3-bucket") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Bucket) ) @@ -986,7 +986,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-ca-file") + CONFIG_OPTION_NAME("repo1-s3-ca-file") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3CaFile) ) @@ -994,7 +994,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-ca-path") + CONFIG_OPTION_NAME("repo1-s3-ca-path") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3CaPath) ) @@ -1002,7 +1002,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-endpoint") + CONFIG_OPTION_NAME("repo1-s3-endpoint") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Endpoint) ) @@ -1010,7 +1010,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-host") + CONFIG_OPTION_NAME("repo1-s3-host") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Host) ) @@ -1018,7 +1018,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-key") + CONFIG_OPTION_NAME("repo1-s3-key") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Key) ) @@ -1026,7 +1026,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-key-secret") + CONFIG_OPTION_NAME("repo1-s3-key-secret") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3KeySecret) ) @@ -1034,7 +1034,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-region") + CONFIG_OPTION_NAME("repo1-s3-region") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3Region) ) @@ -1042,7 +1042,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-s3-verify-ssl") + CONFIG_OPTION_NAME("repo1-s3-verify-ssl") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoS3VerifySsl) ) @@ -1050,7 +1050,7 @@ ConfigOptionData configOptionData[CFG_OPTION_TOTAL] = CONFIG_OPTION_LIST //------------------------------------------------------------------------------------------------------------------------------ CONFIG_OPTION ( - CONFIG_OPTION_NAME("repo-type") + CONFIG_OPTION_NAME("repo1-type") CONFIG_OPTION_INDEX(0) CONFIG_OPTION_DEFINE_ID(cfgDefOptRepoType) ) diff --git a/src/config/config.auto.h b/src/config/config.auto.h index 992d7fed6..033795447 100644 --- a/src/config/config.auto.h +++ b/src/config/config.auto.h @@ -50,12 +50,7 @@ typedef enum cfgOptArchiveCopy, cfgOptArchiveQueueMax, cfgOptArchiveTimeout, - cfgOptBackupCmd, - cfgOptBackupConfig, - cfgOptBackupHost, - cfgOptBackupSshPort, cfgOptBackupStandby, - cfgOptBackupUser, cfgOptBufferSize, cfgOptChecksumPage, cfgOptCmdSsh, @@ -64,19 +59,10 @@ typedef enum cfgOptCompressLevel, cfgOptCompressLevelNetwork, cfgOptConfig, - cfgOptDbCmd, - cfgOptDbConfig = 27, - cfgOptDbHost = 35, - cfgOptDbInclude = 43, - cfgOptDbPath, - cfgOptDbPort = 52, - cfgOptDbSocketPath = 60, - cfgOptDbSshPort = 68, - cfgOptDbTimeout = 76, - cfgOptDbUser, - cfgOptDelta = 85, + cfgOptDbInclude, + cfgOptDbTimeout, + cfgOptDelta, cfgOptForce, - cfgOptHardlink, cfgOptHostId, cfgOptLinkAll, cfgOptLinkMap, @@ -92,12 +78,26 @@ typedef enum cfgOptOutput, cfgOptPerlBin, cfgOptPerlOption, - cfgOptProcess, + cfgOptPgHost, + cfgOptPgHostCmd = 41, + cfgOptPgHostConfig = 49, + cfgOptPgHostPort = 57, + cfgOptPgHostUser = 65, + cfgOptPgPath = 73, + cfgOptPgPort = 81, + cfgOptPgSocketPath = 89, + cfgOptProcess = 97, cfgOptProcessMax, cfgOptProtocolTimeout, cfgOptRecoveryOption, cfgOptRepoCipherPass, cfgOptRepoCipherType, + cfgOptRepoHardlink, + cfgOptRepoHost, + cfgOptRepoHostCmd, + cfgOptRepoHostConfig, + cfgOptRepoHostPort, + cfgOptRepoHostUser, cfgOptRepoPath, cfgOptRepoS3Bucket, cfgOptRepoS3CaFile, diff --git a/src/config/define.auto.c b/src/config/define.auto.c index 63e5f80c6..0b52d00b0 100644 --- a/src/config/define.auto.c +++ b/src/config/define.auto.c @@ -166,7 +166,7 @@ ConfigDefineCommandData configDefineCommandData[] = CFGDEFDATA_COMMAND_LIST CFGDEFDATA_COMMAND_HELP_SUMMARY("Upgrade a stanza.") CFGDEFDATA_COMMAND_HELP_DESCRIPTION ( - "Immediately after upgrading PostgreSQL to a newer major version, the db-path for all pgBackRest configurations must " + "Immediately after upgrading PostgreSQL to a newer major version, the pg-path for all pgBackRest configurations must " "be set to the new database location and the stanza-upgrade run on the backup host. If the database is offline use " "the --no-online option." ) @@ -412,174 +412,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) ) - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("backup-cmd") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(1) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("repository") - CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest exe path on the backup host.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Required only if the path to pgbackrest is different on the local and backup hosts. If not defined, the backup host " - "exe path will be set the same as the local exe path." - ) - - CFGDEFDATA_OPTION_COMMAND_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) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptBackupHost) - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("backup-config") - CFGDEFDATA_OPTION_REQUIRED(true) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(1) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("repository") - CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest backup host configuration file.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Sets the location of the configuration file on the backup host. This is only required if the backup host " - "configuration file is in a different location than the local configuration file." - ) - - CFGDEFDATA_OPTION_COMMAND_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) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptBackupHost) - CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("/etc/pgbackrest.conf") - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("backup-host") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(1) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("repository") - CFGDEFDATA_OPTION_HELP_SUMMARY("Backup host when operating remotely via SSH.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Make sure that trusted SSH authentication is configured between the db host and the backup host.\n" - "\n" - "When backing up to a locally mounted network filesystem this setting is not required." - ) - - CFGDEFDATA_OPTION_COMMAND_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) - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("backup-ssh-port") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeInteger) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(1) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("repository") - CFGDEFDATA_OPTION_HELP_SUMMARY("Backup server SSH port when backup-host is set.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Use this option to specify a non-default SSH port for the backup server." - ) - - CFGDEFDATA_OPTION_COMMAND_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) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptBackupHost) - ) - ) - // ----------------------------------------------------------------------------------------------------------------------------- CFGDEFDATA_OPTION ( @@ -615,52 +447,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) ) - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("backup-user") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(1) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("repository") - CFGDEFDATA_OPTION_HELP_SUMMARY("Backup host user when backup-host is set.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Defines the user that will be used for operations on the backup server. Preferably this is not the postgres user but " - "rather some other user like backrest. If PostgreSQL runs on the backup server the postgres user can be placed in " - "the backrest group so it has read permissions on the repository without being able to damage the contents " - "accidentally." - ) - - CFGDEFDATA_OPTION_COMMAND_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) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptBackupHost) - CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("backrest") - ) - ) - // ----------------------------------------------------------------------------------------------------------------------------- CFGDEFDATA_OPTION ( @@ -977,130 +763,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) ) - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-cmd") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest exe path on the database host.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Required only if the path to pgbackrest is different on the local and database hosts. If not defined, the database " - "host exe path will be set the same as the local exe path." - ) - - CFGDEFDATA_OPTION_COMMAND_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 - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptDbHost) - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-config") - CFGDEFDATA_OPTION_REQUIRED(true) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest database host configuration file.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Sets the location of the configuration file on the database host. This is only required if the database host " - "configuration file is in a different location than the local configuration file." - ) - - CFGDEFDATA_OPTION_COMMAND_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 - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptDbHost) - CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("/etc/pgbackrest.conf") - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-host") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("Cluster host for operating remotely via SSH.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Used for backups where the database cluster host is different from the backup host." - ) - - 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) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - ) - ) - // ----------------------------------------------------------------------------------------------------------------------------- CFGDEFDATA_OPTION ( @@ -1133,198 +795,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) ) - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-path") - CFGDEFDATA_OPTION_REQUIRED(true) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("Cluster data directory.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "This should be the same as the data_directory setting in postgresql.conf. Even though this value can be read from " - "postgresql.conf or the database cluster it is prudent to set it in case those resources are not available during " - "a restore or offline backup scenario.\n" - "\n" - "The db-path option is tested against the value reported by PostgreSQL on every online backup so it should always be " - "current." - ) - - CFGDEFDATA_OPTION_COMMAND_LIST - ( - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchiveGet) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRemote) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - - CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE - ( - CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdArchiveGet) - - CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) - ) - - CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE - ( - CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdArchivePush) - - CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) - ) - - CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE - ( - CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdLocal) - - CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) - ) - - CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE - ( - CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdRemote) - - CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) - ) - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-port") - CFGDEFDATA_OPTION_REQUIRED(true) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeInteger) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("Cluster port.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Port that PostgreSQL is running on. This usually does not need to be specified as most database clusters run on the " - "default port." - ) - - CFGDEFDATA_OPTION_COMMAND_LIST - ( - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRemote) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("5432") - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-socket-path") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("Cluster unix socket path.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "The unix socket directory that was specified when PostgreSQL was started. pgBackRest will automatically look in the " - "standard location for your OS so there usually no need to specify this setting unless the socket directory was " - "explicitly modified with the unix_socket_directory setting in postgressql.conf." - ) - - CFGDEFDATA_OPTION_COMMAND_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) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - ) - ) - - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-ssh-port") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeInteger) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("Database server SSH port when db-host is set.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Use this option to specify a non-default SSH port for a database server." - ) - - 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) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptDbHost) - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - ) - ) - // ----------------------------------------------------------------------------------------------------------------------------- CFGDEFDATA_OPTION ( @@ -1368,45 +838,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) ) - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("db-user") - CFGDEFDATA_OPTION_REQUIRED(false) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(8) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("stanza") - CFGDEFDATA_OPTION_HELP_SUMMARY("Cluster host logon user when db-host is set.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "This user will also own the remote pgBackRest process and will initiate connections to PostgreSQL. For this to work " - "correctly the user should be the PostgreSQL database cluster owner which is generally postgres, the default." - ) - - CFGDEFDATA_OPTION_COMMAND_LIST - ( - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptDbHost) - CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("postgres") - CFGDEFDATA_OPTION_OPTIONAL_PREFIX("db") - ) - ) - // ----------------------------------------------------------------------------------------------------------------------------- CFGDEFDATA_OPTION ( @@ -1557,39 +988,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) ) - // ----------------------------------------------------------------------------------------------------------------------------- - CFGDEFDATA_OPTION - ( - CFGDEFDATA_OPTION_NAME("hardlink") - CFGDEFDATA_OPTION_REQUIRED(true) - CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) - CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeBoolean) - CFGDEFDATA_OPTION_INTERNAL(false) - - CFGDEFDATA_OPTION_INDEX_TOTAL(1) - CFGDEFDATA_OPTION_NEGATE(true) - CFGDEFDATA_OPTION_SECURE(false) - - CFGDEFDATA_OPTION_HELP_SECTION("backup") - CFGDEFDATA_OPTION_HELP_SUMMARY("Hardlink files between backups.") - CFGDEFDATA_OPTION_HELP_DESCRIPTION - ( - "Enable hard-linking of files in differential and incremental backups to their full backups. This gives the appearance " - "that each backup is a full backup. Be careful, though, because modifying files that are hard-linked can affect " - "all the backups in the set." - ) - - CFGDEFDATA_OPTION_COMMAND_LIST - ( - CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) - ) - - CFGDEFDATA_OPTION_OPTIONAL_LIST - ( - CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("0") - ) - ) - // ----------------------------------------------------------------------------------------------------------------------------- CFGDEFDATA_OPTION ( @@ -2257,6 +1655,369 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) ) + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-host") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("PostgreSQL host for operating remotely via SSH.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Used for backups where the PostgreSQL host is different from the backup host." + ) + + 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) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-host") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-host-cmd") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest exe path on the PostgreSQL host.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Required only if the path to pgbackrest is different on the local and PostgreSQL hosts. If not defined, the database " + "host exe path will be set the same as the local exe path." + ) + + CFGDEFDATA_OPTION_COMMAND_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 + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptPgHost) + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-cmd") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-host-config") + CFGDEFDATA_OPTION_REQUIRED(true) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest database host configuration file.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Sets the location of the configuration file on the PostgreSQL host. This is only required if the PostgreSQL host " + "configuration file is in a different location than the local configuration file." + ) + + CFGDEFDATA_OPTION_COMMAND_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 + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptPgHost) + CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("/etc/pgbackrest.conf") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-config") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-host-port") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeInteger) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("PostgreSQL host port when pg-host is set.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Use this option to specify a non-default port for the PostgreSQL host protocol. Currently only SSH is supported" + ) + + 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) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStart) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStop) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptPgHost) + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-ssh-port") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-host-user") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("PostgreSQL host logon user when pg-host is set.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "This user will also own the remote pgBackRest process and will initiate connections to PostgreSQL. For this to work " + "correctly the user should be the PostgreSQL database cluster owner which is generally postgres, the default." + ) + + CFGDEFDATA_OPTION_COMMAND_LIST + ( + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptPgHost) + CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("postgres") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-user") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-path") + CFGDEFDATA_OPTION_REQUIRED(true) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("PostgreSQL data directory.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "This should be the same as the data_directory setting in postgresql.conf. Even though this value can be read from " + "postgresql.conf or PostgreSQL it is prudent to set it in case those resources are not available during a restore " + "or offline backup scenario.\n" + "\n" + "The pg-path option is tested against the value reported by PostgreSQL on every online backup so it should always be " + "current." + ) + + CFGDEFDATA_OPTION_COMMAND_LIST + ( + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchiveGet) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdLocal) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRemote) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRestore) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-path") + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdArchiveGet) + + CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdArchivePush) + + CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdLocal) + + CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) + ) + + CFGDEFDATA_OPTION_OPTIONAL_COMMAND_OVERRRIDE + ( + CFGDEFDATA_OPTION_OPTIONAL_COMMAND(cfgDefCmdRemote) + + CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(false) + ) + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-port") + CFGDEFDATA_OPTION_REQUIRED(true) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeInteger) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("PostgreSQL port.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Port that PostgreSQL is running on. This usually does not need to be specified as most PostgreSQL clusters run on the " + "default port." + ) + + CFGDEFDATA_OPTION_COMMAND_LIST + ( + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdCheck) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdRemote) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaCreate) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaDelete) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("5432") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-port") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("pg-socket-path") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionStanza) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(8) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("stanza") + CFGDEFDATA_OPTION_HELP_SUMMARY("PostgreSQL unix socket path.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "The unix socket directory that was specified when PostgreSQL was started. pgBackRest will automatically look in the " + "standard location for your OS so there is usually no need to specify this setting unless the socket directory was " + "explicitly modified with the unix_socket_directory setting in postgresql.conf." + ) + + CFGDEFDATA_OPTION_COMMAND_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) + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdStanzaUpgrade) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("pg") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("db-socket-path") + ) + ) + // ----------------------------------------------------------------------------------------------------------------------------- CFGDEFDATA_OPTION ( @@ -2326,7 +2087,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( CFGDEFDATA_OPTION_OPTIONAL_ALLOW_RANGE(1, 96) CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("1") - CFGDEFDATA_OPTION_OPTIONAL_NAME_ALT("thread-max") ) ) @@ -2466,6 +2226,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoCipherType, "aes-256-cbc" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2519,6 +2281,270 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("none") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("repo-hardlink") + CFGDEFDATA_OPTION_REQUIRED(true) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeBoolean) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(1) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("repository") + CFGDEFDATA_OPTION_HELP_SUMMARY("Hardlink files between backups in the repository.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Enable hard-linking of files in differential and incremental backups to their full backups. This gives the appearance " + "that each backup is a full backup at the file-system level. Be careful, though, because modifying files that are " + "hard-linked can affect all the backups in the set." + ) + + CFGDEFDATA_OPTION_COMMAND_LIST + ( + CFGDEFDATA_OPTION_COMMAND(cfgDefCmdBackup) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("0") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("hardlink") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("repo-host") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(1) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("repository") + CFGDEFDATA_OPTION_HELP_SUMMARY("Repository host when operating remotely via SSH.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Make sure that trusted SSH authentication is configured between the PostgreSQL host and the repository host.\n" + "\n" + "When backing up and archiving to a locally mounted filesystem this setting is not required." + ) + + CFGDEFDATA_OPTION_COMMAND_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) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("backup-host") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("repo-host-cmd") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(1) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("repository") + CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest exe path on the repository host.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Required only if the path to pgbackrest is different on the local and repository hosts. If not defined, the " + "repository host exe path will be set the same as the local exe path." + ) + + CFGDEFDATA_OPTION_COMMAND_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) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptRepoHost) + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("backup-cmd") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("repo-host-config") + CFGDEFDATA_OPTION_REQUIRED(true) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(1) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("repository") + CFGDEFDATA_OPTION_HELP_SUMMARY("pgBackRest repository host configuration file.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Sets the location of the configuration file on the repository host. This is only required if the repository host " + "configuration file is in a different location than the local configuration file." + ) + + CFGDEFDATA_OPTION_COMMAND_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) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptRepoHost) + CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("/etc/pgbackrest.conf") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("backup-config") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("repo-host-port") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeInteger) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(1) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("repository") + CFGDEFDATA_OPTION_HELP_SUMMARY("Repository host port when repo-host is set.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Use this option to specify a non-default port for the repository host protocol. Currently only SSH is supported" + ) + + CFGDEFDATA_OPTION_COMMAND_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) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptRepoHost) + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("backup-ssh-port") + ) + ) + + // ----------------------------------------------------------------------------------------------------------------------------- + CFGDEFDATA_OPTION + ( + CFGDEFDATA_OPTION_NAME("repo-host-user") + CFGDEFDATA_OPTION_REQUIRED(false) + CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal) + CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeString) + CFGDEFDATA_OPTION_INTERNAL(false) + + CFGDEFDATA_OPTION_INDEX_TOTAL(1) + CFGDEFDATA_OPTION_NEGATE(true) + CFGDEFDATA_OPTION_SECURE(false) + + CFGDEFDATA_OPTION_HELP_SECTION("repository") + CFGDEFDATA_OPTION_HELP_SUMMARY("Repository host user when repo-host is set.") + CFGDEFDATA_OPTION_HELP_DESCRIPTION + ( + "Defines the user that will be used for operations on the repository host. Preferably this is not the postgres user " + "but rather some other user like pgbackrest. If PostgreSQL runs on the repository host the postgres user can be " + "placed in the pgbackrest group so it has read permissions on the repository without being able to damage the " + "contents accidentally." + ) + + CFGDEFDATA_OPTION_COMMAND_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) + ) + + CFGDEFDATA_OPTION_OPTIONAL_LIST + ( + CFGDEFDATA_OPTION_OPTIONAL_DEPEND(cfgDefOptRepoHost) + CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("pgbackrest") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") + CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT("backup-user") ) ) @@ -2568,6 +2594,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_OPTIONAL_LIST ( CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("/var/lib/pgbackrest") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2619,6 +2646,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2667,6 +2696,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2715,6 +2746,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2763,6 +2796,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2811,6 +2846,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2859,6 +2896,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2907,6 +2946,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -2955,6 +2996,8 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST cfgDefOptRepoType, "s3" ) + + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -3006,6 +3049,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("1") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) @@ -3061,6 +3105,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ) CFGDEFDATA_OPTION_OPTIONAL_DEFAULT("posix") + CFGDEFDATA_OPTION_OPTIONAL_PREFIX("repo") ) ) diff --git a/src/config/define.auto.h b/src/config/define.auto.h index 8ef4f5abb..c39a45c64 100644 --- a/src/config/define.auto.h +++ b/src/config/define.auto.h @@ -52,12 +52,7 @@ typedef enum cfgDefOptArchiveCopy, cfgDefOptArchiveQueueMax, cfgDefOptArchiveTimeout, - cfgDefOptBackupCmd, - cfgDefOptBackupConfig, - cfgDefOptBackupHost, - cfgDefOptBackupSshPort, cfgDefOptBackupStandby, - cfgDefOptBackupUser, cfgDefOptBufferSize, cfgDefOptChecksumPage, cfgDefOptCmdSsh, @@ -66,19 +61,10 @@ typedef enum cfgDefOptCompressLevel, cfgDefOptCompressLevelNetwork, cfgDefOptConfig, - cfgDefOptDbCmd, - cfgDefOptDbConfig, - cfgDefOptDbHost, cfgDefOptDbInclude, - cfgDefOptDbPath, - cfgDefOptDbPort, - cfgDefOptDbSocketPath, - cfgDefOptDbSshPort, cfgDefOptDbTimeout, - cfgDefOptDbUser, cfgDefOptDelta, cfgDefOptForce, - cfgDefOptHardlink, cfgDefOptHostId, cfgDefOptLinkAll, cfgDefOptLinkMap, @@ -94,12 +80,26 @@ typedef enum cfgDefOptOutput, cfgDefOptPerlBin, cfgDefOptPerlOption, + cfgDefOptPgHost, + cfgDefOptPgHostCmd, + cfgDefOptPgHostConfig, + cfgDefOptPgHostPort, + cfgDefOptPgHostUser, + cfgDefOptPgPath, + cfgDefOptPgPort, + cfgDefOptPgSocketPath, cfgDefOptProcess, cfgDefOptProcessMax, cfgDefOptProtocolTimeout, cfgDefOptRecoveryOption, cfgDefOptRepoCipherPass, cfgDefOptRepoCipherType, + cfgDefOptRepoHardlink, + cfgDefOptRepoHost, + cfgDefOptRepoHostCmd, + cfgDefOptRepoHostConfig, + cfgDefOptRepoHostPort, + cfgDefOptRepoHostUser, cfgDefOptRepoPath, cfgDefOptRepoS3Bucket, cfgDefOptRepoS3CaFile, diff --git a/src/config/define.c b/src/config/define.c index c17bc8c28..a2f1065b8 100644 --- a/src/config/define.c +++ b/src/config/define.c @@ -42,7 +42,7 @@ typedef struct ConfigDefineOptionData const char *name; // Option name unsigned int type:3; // Option type (e.g. string, int, boolean, etc.) unsigned int internal:1; // Is the option only used internally? - unsigned int indexTotal:4; // 0 normally, > 0 if indexed option (e.g. db1-*) + unsigned int indexTotal:4; // 0 normally, > 0 if indexed option (e.g. pg1-*) unsigned int section:2; // Config section (e.g. global, stanza, cmd-line) bool negate:1; // Can the option be negated? bool required:1; // Is the option required? @@ -100,9 +100,9 @@ typedef enum configDefDataTypeCommand, configDefDataTypeDefault, configDefDataTypeDepend, - configDefDataTypeNameAlt, configDefDataTypePrefix, configDefDataTypeRequired, + configDefDataTypeHelpNameAlt, configDefDataTypeHelpSummary, configDefDataTypeHelpDescription, } ConfigDefineDataType; @@ -134,9 +134,6 @@ typedef enum configDefDataTypeAllowRange, 2, 0, (const void *)(intptr_t)(int32)(rangeMinParam * 100), \ (const void *)(intptr_t)(int32)(rangeMaxParam * 100)), -#define CFGDEFDATA_OPTION_OPTIONAL_NAME_ALT(nameAltParam) \ - CFGDATA_OPTION_OPTIONAL_PUSH_LIST(configDefDataTypeNameAlt, 1, 0, nameAltParam), - #define CFGDEFDATA_OPTION_OPTIONAL_PREFIX(prefixParam) \ CFGDATA_OPTION_OPTIONAL_PUSH_LIST(configDefDataTypePrefix, 1, 0, prefixParam), @@ -156,6 +153,9 @@ typedef enum #define CFGDEFDATA_OPTION_OPTIONAL_REQUIRED(commandOptionRequired) \ CFGDATA_OPTION_OPTIONAL_PUSH(configDefDataTypeRequired, 0, commandOptionRequired), +#define CFGDEFDATA_OPTION_OPTIONAL_HELP_NAME_ALT(...) \ + CFGDATA_OPTION_OPTIONAL_PUSH_LIST( \ + configDefDataTypeHelpNameAlt, sizeof((const char *[]){__VA_ARGS__}) / sizeof(const char *), 0, __VA_ARGS__), #define CFGDEFDATA_OPTION_OPTIONAL_HELP_SUMMARY(helpSummaryParam) \ CFGDATA_OPTION_OPTIONAL_PUSH_LIST(configDefDataTypeHelpSummary, 1, 0, helpSummaryParam), #define CFGDEFDATA_OPTION_OPTIONAL_HELP_DESCRIPTION(helpDescriptionParam) \ @@ -466,6 +466,42 @@ cfgDefOptionHelpDescription(ConfigDefineCommand commandDefId, ConfigDefineOption return configDefineOptionData[optionDefId].helpDescription; } +/*********************************************************************************************************************************** +Option help name alt +***********************************************************************************************************************************/ +bool +cfgDefOptionHelpNameAlt(ConfigDefineOption optionDefId) +{ + cfgDefOptionCheck(optionDefId); + + CONFIG_DEFINE_DATA_FIND(-1, optionDefId, configDefDataTypeHelpNameAlt); + + return dataDefFound; +} + +const char * +cfgDefOptionHelpNameAltValue(ConfigDefineOption optionDefId, int valueId) +{ + cfgDefOptionCheck(optionDefId); + + CONFIG_DEFINE_DATA_FIND(-1, optionDefId, configDefDataTypeHelpNameAlt); + + if (valueId < 0 || valueId >= dataDefListSize) + THROW(AssertError, "value id %d invalid - must be >= 0 and < %d", valueId, dataDefListSize); + + return (char *)dataDefList[valueId]; +} + +int +cfgDefOptionHelpNameAltValueTotal(ConfigDefineOption optionDefId) +{ + cfgDefOptionCheck(optionDefId); + + CONFIG_DEFINE_DATA_FIND(-1, optionDefId, configDefDataTypeHelpNameAlt); + + return dataDefListSize; +} + /*********************************************************************************************************************************** Option help section ***********************************************************************************************************************************/ @@ -492,6 +528,19 @@ cfgDefOptionHelpSummary(ConfigDefineCommand commandDefId, ConfigDefineOption opt return configDefineOptionData[optionDefId].helpSummary; } +/*********************************************************************************************************************************** +Get option id by name +***********************************************************************************************************************************/ +int +cfgDefOptionId(const char *optionName) +{ + for (ConfigDefineOption optionDefId = 0; optionDefId < cfgDefOptionTotal(); optionDefId++) + if (strcmp(optionName, configDefineOptionData[optionDefId].name) == 0) + return optionDefId; + + return -1; +} + /*********************************************************************************************************************************** Get total indexed values for option ***********************************************************************************************************************************/ @@ -522,22 +571,6 @@ cfgDefOptionName(ConfigDefineOption optionDefId) return configDefineOptionData[optionDefId].name; } -/*********************************************************************************************************************************** -Alternate name for the option -- generally used for deprecation -***********************************************************************************************************************************/ -const char * -cfgDefOptionNameAlt(ConfigDefineOption optionDefId) -{ - cfgDefOptionCheck(optionDefId); - - CONFIG_DEFINE_DATA_FIND(-1, optionDefId, configDefDataTypeNameAlt); - - if (dataDefFound) - return (char *)dataDefList[0]; - - return NULL; -} - /*********************************************************************************************************************************** Can the option be negated? ***********************************************************************************************************************************/ diff --git a/src/config/define.h b/src/config/define.h index b9f776480..f70afc1de 100644 --- a/src/config/define.h +++ b/src/config/define.h @@ -45,12 +45,15 @@ int cfgDefOptionDependValueTotal(ConfigDefineCommand commandDefId, ConfigDefineO bool cfgDefOptionDependValueValid(ConfigDefineCommand commandDefId, ConfigDefineOption optionDefId, const char *value); const char *cfgDefOptionDependValue(ConfigDefineCommand commandDefId, ConfigDefineOption optionDefId, int valueId); const char *cfgDefOptionHelpDescription(ConfigDefineCommand commandDefId, ConfigDefineOption optionDefId); +bool cfgDefOptionHelpNameAlt(ConfigDefineOption optionDefId); +const char *cfgDefOptionHelpNameAltValue(ConfigDefineOption optionDefId, int valueId); +int cfgDefOptionHelpNameAltValueTotal(ConfigDefineOption optionDefId); 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); const char *cfgDefOptionName(ConfigDefineOption optionDefId); -const char *cfgDefOptionNameAlt(ConfigDefineOption optionDefId); bool cfgDefOptionNegate(ConfigDefineOption optionDefId); const char *cfgDefOptionPrefix(ConfigDefineOption optionDefId); bool cfgDefOptionRequired(ConfigDefineCommand commandDefId, ConfigDefineOption optionDefId); diff --git a/src/config/load.c b/src/config/load.c index b3f40bbae..9c7c5a529 100644 --- a/src/config/load.c +++ b/src/config/load.c @@ -38,19 +38,20 @@ cfgLoad(int argListSize, const char *argList[]) logInit(logLevelConsole, logLevelStdErr, logTimestamp); } - // Set default for backup-cmd - if (cfgOptionValid(cfgOptBackupHost) && cfgOption(cfgOptBackupHost) != NULL && - cfgOptionSource(cfgOptBackupCmd) == cfgSourceDefault) + // Set default for repo-host-cmd + if (cfgOptionValid(cfgOptRepoHost) && cfgOption(cfgOptRepoHost) != NULL && + cfgOptionSource(cfgOptRepoHostCmd) == cfgSourceDefault) { - cfgOptionDefaultSet(cfgOptBackupCmd, varNewStr(cfgExe())); + cfgOptionDefaultSet(cfgOptRepoHostCmd, varNewStr(cfgExe())); } - if (cfgOptionValid(cfgOptDbCmd)) + // Set default for pg-host-cmd + if (cfgOptionValid(cfgOptPgHostCmd)) { - for (int optionIdx = 0; optionIdx <= cfgOptionIndexTotal(cfgOptDbHost); optionIdx++) + for (int optionIdx = 0; optionIdx <= cfgOptionIndexTotal(cfgOptPgHost); optionIdx++) { - if (cfgOption(cfgOptDbHost + optionIdx) != NULL && cfgOptionSource(cfgOptDbCmd + optionIdx) == cfgSourceDefault) - cfgOptionDefaultSet(cfgOptDbCmd + optionIdx, varNewStr(cfgExe())); + if (cfgOption(cfgOptPgHost + optionIdx) != NULL && cfgOptionSource(cfgOptPgHostCmd + optionIdx) == cfgSourceDefault) + cfgOptionDefaultSet(cfgOptPgHostCmd + optionIdx, varNewStr(cfgExe())); } } } diff --git a/src/config/parse.auto.c b/src/config/parse.auto.c index f980bb2aa..7f5aa4f43 100644 --- a/src/config/parse.auto.c +++ b/src/config/parse.auto.c @@ -9,6 +9,8 @@ Option parse data ***********************************************************************************************************************************/ static const struct option optionList[] = { + // archive-async option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "archive-async", .val = PARSE_OPTION_FLAG | cfgOptArchiveAsync, @@ -17,6 +19,9 @@ static const struct option optionList[] = .name = "no-archive-async", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveAsync, }, + + // archive-check option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "archive-check", .val = PARSE_OPTION_FLAG | cfgOptArchiveCheck, @@ -25,6 +30,9 @@ static const struct option optionList[] = .name = "no-archive-check", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveCheck, }, + + // archive-copy option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "archive-copy", .val = PARSE_OPTION_FLAG | cfgOptArchiveCopy, @@ -33,6 +41,9 @@ static const struct option optionList[] = .name = "no-archive-copy", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveCopy, }, + + // archive-queue-max option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "archive-queue-max", .has_arg = required_argument, @@ -42,6 +53,9 @@ static const struct option optionList[] = .name = "no-archive-queue-max", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveQueueMax, }, + + // archive-timeout option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "archive-timeout", .has_arg = required_argument, @@ -51,42 +65,9 @@ static const struct option optionList[] = .name = "no-archive-timeout", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptArchiveTimeout, }, - { - .name = "backup-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptBackupCmd, - }, - { - .name = "no-backup-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBackupCmd, - }, - { - .name = "backup-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptBackupConfig, - }, - { - .name = "no-backup-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBackupConfig, - }, - { - .name = "backup-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptBackupHost, - }, - { - .name = "no-backup-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBackupHost, - }, - { - .name = "backup-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptBackupSshPort, - }, - { - .name = "no-backup-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBackupSshPort, - }, + + // backup-standby option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "backup-standby", .val = PARSE_OPTION_FLAG | cfgOptBackupStandby, @@ -95,15 +76,9 @@ static const struct option optionList[] = .name = "no-backup-standby", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBackupStandby, }, - { - .name = "backup-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptBackupUser, - }, - { - .name = "no-backup-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBackupUser, - }, + + // buffer-size option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "buffer-size", .has_arg = required_argument, @@ -113,6 +88,9 @@ static const struct option optionList[] = .name = "no-buffer-size", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptBufferSize, }, + + // checksum-page option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "checksum-page", .val = PARSE_OPTION_FLAG | cfgOptChecksumPage, @@ -121,6 +99,9 @@ static const struct option optionList[] = .name = "no-checksum-page", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptChecksumPage, }, + + // cmd-ssh option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "cmd-ssh", .has_arg = required_argument, @@ -130,11 +111,17 @@ static const struct option optionList[] = .name = "no-cmd-ssh", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptCmdSsh, }, + + // command option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "command", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptCommand, }, + + // compress option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "compress", .val = PARSE_OPTION_FLAG | cfgOptCompress, @@ -143,6 +130,9 @@ static const struct option optionList[] = .name = "no-compress", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptCompress, }, + + // compress-level option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "compress-level", .has_arg = required_argument, @@ -152,6 +142,9 @@ static const struct option optionList[] = .name = "no-compress-level", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptCompressLevel, }, + + // compress-level-network option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "compress-level-network", .has_arg = required_argument, @@ -161,6 +154,9 @@ static const struct option optionList[] = .name = "no-compress-level-network", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptCompressLevelNetwork, }, + + // config option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "config", .has_arg = required_argument, @@ -170,249 +166,9 @@ static const struct option optionList[] = .name = "no-config", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptConfig, }, - { - .name = "db-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbCmd, - }, - { - .name = "no-db-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbCmd, - }, - { - .name = "db1-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbCmd, - }, - { - .name = "no-db1-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbCmd, - }, - { - .name = "db2-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbCmd + 1), - }, - { - .name = "no-db2-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbCmd + 1), - }, - { - .name = "db3-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbCmd + 2), - }, - { - .name = "no-db3-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbCmd + 2), - }, - { - .name = "db4-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbCmd + 3), - }, - { - .name = "no-db4-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbCmd + 3), - }, - { - .name = "db5-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbCmd + 4), - }, - { - .name = "no-db5-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbCmd + 4), - }, - { - .name = "db6-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbCmd + 5), - }, - { - .name = "no-db6-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbCmd + 5), - }, - { - .name = "db7-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbCmd + 6), - }, - { - .name = "no-db7-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbCmd + 6), - }, - { - .name = "db8-cmd", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbCmd + 7), - }, - { - .name = "no-db8-cmd", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbCmd + 7), - }, - { - .name = "db-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbConfig, - }, - { - .name = "no-db-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbConfig, - }, - { - .name = "db1-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbConfig, - }, - { - .name = "no-db1-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbConfig, - }, - { - .name = "db2-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbConfig + 1), - }, - { - .name = "no-db2-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbConfig + 1), - }, - { - .name = "db3-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbConfig + 2), - }, - { - .name = "no-db3-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbConfig + 2), - }, - { - .name = "db4-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbConfig + 3), - }, - { - .name = "no-db4-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbConfig + 3), - }, - { - .name = "db5-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbConfig + 4), - }, - { - .name = "no-db5-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbConfig + 4), - }, - { - .name = "db6-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbConfig + 5), - }, - { - .name = "no-db6-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbConfig + 5), - }, - { - .name = "db7-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbConfig + 6), - }, - { - .name = "no-db7-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbConfig + 6), - }, - { - .name = "db8-config", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbConfig + 7), - }, - { - .name = "no-db8-config", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbConfig + 7), - }, - { - .name = "db-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbHost, - }, - { - .name = "no-db-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbHost, - }, - { - .name = "db1-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbHost, - }, - { - .name = "no-db1-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbHost, - }, - { - .name = "db2-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbHost + 1), - }, - { - .name = "no-db2-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbHost + 1), - }, - { - .name = "db3-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbHost + 2), - }, - { - .name = "no-db3-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbHost + 2), - }, - { - .name = "db4-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbHost + 3), - }, - { - .name = "no-db4-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbHost + 3), - }, - { - .name = "db5-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbHost + 4), - }, - { - .name = "no-db5-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbHost + 4), - }, - { - .name = "db6-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbHost + 5), - }, - { - .name = "no-db6-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbHost + 5), - }, - { - .name = "db7-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbHost + 6), - }, - { - .name = "no-db7-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbHost + 6), - }, - { - .name = "db8-host", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbHost + 7), - }, - { - .name = "no-db8-host", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbHost + 7), - }, + + // db-include option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "db-include", .has_arg = required_argument, @@ -422,330 +178,9 @@ static const struct option optionList[] = .name = "no-db-include", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbInclude, }, - { - .name = "db-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbPath, - }, - { - .name = "no-db-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbPath, - }, - { - .name = "db1-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbPath, - }, - { - .name = "no-db1-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbPath, - }, - { - .name = "db2-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPath + 1), - }, - { - .name = "no-db2-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPath + 1), - }, - { - .name = "db3-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPath + 2), - }, - { - .name = "no-db3-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPath + 2), - }, - { - .name = "db4-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPath + 3), - }, - { - .name = "no-db4-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPath + 3), - }, - { - .name = "db5-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPath + 4), - }, - { - .name = "no-db5-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPath + 4), - }, - { - .name = "db6-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPath + 5), - }, - { - .name = "no-db6-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPath + 5), - }, - { - .name = "db7-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPath + 6), - }, - { - .name = "no-db7-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPath + 6), - }, - { - .name = "db8-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPath + 7), - }, - { - .name = "no-db8-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPath + 7), - }, - { - .name = "db-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbPort, - }, - { - .name = "no-db-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbPort, - }, - { - .name = "db1-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbPort, - }, - { - .name = "no-db1-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbPort, - }, - { - .name = "db2-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPort + 1), - }, - { - .name = "no-db2-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPort + 1), - }, - { - .name = "db3-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPort + 2), - }, - { - .name = "no-db3-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPort + 2), - }, - { - .name = "db4-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPort + 3), - }, - { - .name = "no-db4-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPort + 3), - }, - { - .name = "db5-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPort + 4), - }, - { - .name = "no-db5-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPort + 4), - }, - { - .name = "db6-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPort + 5), - }, - { - .name = "no-db6-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPort + 5), - }, - { - .name = "db7-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPort + 6), - }, - { - .name = "no-db7-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPort + 6), - }, - { - .name = "db8-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbPort + 7), - }, - { - .name = "no-db8-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbPort + 7), - }, - { - .name = "db-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbSocketPath, - }, - { - .name = "no-db-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbSocketPath, - }, - { - .name = "db1-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbSocketPath, - }, - { - .name = "no-db1-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbSocketPath, - }, - { - .name = "db2-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSocketPath + 1), - }, - { - .name = "no-db2-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSocketPath + 1), - }, - { - .name = "db3-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSocketPath + 2), - }, - { - .name = "no-db3-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSocketPath + 2), - }, - { - .name = "db4-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSocketPath + 3), - }, - { - .name = "no-db4-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSocketPath + 3), - }, - { - .name = "db5-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSocketPath + 4), - }, - { - .name = "no-db5-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSocketPath + 4), - }, - { - .name = "db6-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSocketPath + 5), - }, - { - .name = "no-db6-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSocketPath + 5), - }, - { - .name = "db7-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSocketPath + 6), - }, - { - .name = "no-db7-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSocketPath + 6), - }, - { - .name = "db8-socket-path", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSocketPath + 7), - }, - { - .name = "no-db8-socket-path", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSocketPath + 7), - }, - { - .name = "db-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbSshPort, - }, - { - .name = "no-db-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbSshPort, - }, - { - .name = "db1-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbSshPort, - }, - { - .name = "no-db1-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbSshPort, - }, - { - .name = "db2-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSshPort + 1), - }, - { - .name = "no-db2-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSshPort + 1), - }, - { - .name = "db3-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSshPort + 2), - }, - { - .name = "no-db3-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSshPort + 2), - }, - { - .name = "db4-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSshPort + 3), - }, - { - .name = "no-db4-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSshPort + 3), - }, - { - .name = "db5-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSshPort + 4), - }, - { - .name = "no-db5-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSshPort + 4), - }, - { - .name = "db6-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSshPort + 5), - }, - { - .name = "no-db6-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSshPort + 5), - }, - { - .name = "db7-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSshPort + 6), - }, - { - .name = "no-db7-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSshPort + 6), - }, - { - .name = "db8-ssh-port", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbSshPort + 7), - }, - { - .name = "no-db8-ssh-port", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbSshPort + 7), - }, + + // db-timeout option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "db-timeout", .has_arg = required_argument, @@ -755,108 +190,31 @@ static const struct option optionList[] = .name = "no-db-timeout", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbTimeout, }, - { - .name = "db-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbUser, - }, - { - .name = "no-db-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbUser, - }, - { - .name = "db1-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | cfgOptDbUser, - }, - { - .name = "no-db1-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptDbUser, - }, - { - .name = "db2-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbUser + 1), - }, - { - .name = "no-db2-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbUser + 1), - }, - { - .name = "db3-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbUser + 2), - }, - { - .name = "no-db3-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbUser + 2), - }, - { - .name = "db4-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbUser + 3), - }, - { - .name = "no-db4-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbUser + 3), - }, - { - .name = "db5-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbUser + 4), - }, - { - .name = "no-db5-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbUser + 4), - }, - { - .name = "db6-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbUser + 5), - }, - { - .name = "no-db6-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbUser + 5), - }, - { - .name = "db7-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbUser + 6), - }, - { - .name = "no-db7-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbUser + 6), - }, - { - .name = "db8-user", - .has_arg = required_argument, - .val = PARSE_OPTION_FLAG | (cfgOptDbUser + 7), - }, - { - .name = "no-db8-user", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptDbUser + 7), - }, + + // delta option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "delta", .val = PARSE_OPTION_FLAG | cfgOptDelta, }, + + // force option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "force", .val = PARSE_OPTION_FLAG | cfgOptForce, }, - { - .name = "hardlink", - .val = PARSE_OPTION_FLAG | cfgOptHardlink, - }, - { - .name = "no-hardlink", - .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptHardlink, - }, + + // host-id option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "host-id", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptHostId, }, + + // link-all option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "link-all", .val = PARSE_OPTION_FLAG | cfgOptLinkAll, @@ -865,6 +223,9 @@ static const struct option optionList[] = .name = "no-link-all", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLinkAll, }, + + // link-map option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "link-map", .has_arg = required_argument, @@ -874,6 +235,9 @@ static const struct option optionList[] = .name = "no-link-map", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLinkMap, }, + + // lock-path option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "lock-path", .has_arg = required_argument, @@ -883,6 +247,9 @@ static const struct option optionList[] = .name = "no-lock-path", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLockPath, }, + + // log-level-console option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "log-level-console", .has_arg = required_argument, @@ -892,6 +259,9 @@ static const struct option optionList[] = .name = "no-log-level-console", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLogLevelConsole, }, + + // log-level-file option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "log-level-file", .has_arg = required_argument, @@ -901,6 +271,9 @@ static const struct option optionList[] = .name = "no-log-level-file", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLogLevelFile, }, + + // log-level-stderr option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "log-level-stderr", .has_arg = required_argument, @@ -910,6 +283,9 @@ static const struct option optionList[] = .name = "no-log-level-stderr", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLogLevelStderr, }, + + // log-path option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "log-path", .has_arg = required_argument, @@ -919,6 +295,9 @@ static const struct option optionList[] = .name = "no-log-path", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLogPath, }, + + // log-timestamp option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "log-timestamp", .val = PARSE_OPTION_FLAG | cfgOptLogTimestamp, @@ -927,6 +306,9 @@ static const struct option optionList[] = .name = "no-log-timestamp", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptLogTimestamp, }, + + // manifest-save-threshold option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "manifest-save-threshold", .has_arg = required_argument, @@ -936,6 +318,9 @@ static const struct option optionList[] = .name = "no-manifest-save-threshold", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptManifestSaveThreshold, }, + + // neutral-umask option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "neutral-umask", .val = PARSE_OPTION_FLAG | cfgOptNeutralUmask, @@ -944,6 +329,9 @@ static const struct option optionList[] = .name = "no-neutral-umask", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptNeutralUmask, }, + + // online option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "online", .val = PARSE_OPTION_FLAG | cfgOptOnline, @@ -952,11 +340,17 @@ static const struct option optionList[] = .name = "no-online", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptOnline, }, + + // output option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "output", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptOutput, }, + + // perl-bin option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "perl-bin", .has_arg = required_argument, @@ -966,6 +360,9 @@ static const struct option optionList[] = .name = "no-perl-bin", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPerlBin, }, + + // perl-option option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "perl-option", .has_arg = required_argument, @@ -975,11 +372,977 @@ static const struct option optionList[] = .name = "no-perl-option", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPerlOption, }, + + // pg-host option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgHost, + }, + { + .name = "no-pg1-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgHost, + }, + { + .name = "db-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHost, + }, + { + .name = "db1-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHost, + }, + { + .name = "pg2-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 1), + }, + { + .name = "no-pg2-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHost + 1), + }, + { + .name = "db2-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 1), + }, + { + .name = "pg3-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 2), + }, + { + .name = "no-pg3-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHost + 2), + }, + { + .name = "db3-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 2), + }, + { + .name = "pg4-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 3), + }, + { + .name = "no-pg4-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHost + 3), + }, + { + .name = "db4-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 3), + }, + { + .name = "pg5-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 4), + }, + { + .name = "no-pg5-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHost + 4), + }, + { + .name = "db5-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 4), + }, + { + .name = "pg6-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 5), + }, + { + .name = "no-pg6-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHost + 5), + }, + { + .name = "db6-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 5), + }, + { + .name = "pg7-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 6), + }, + { + .name = "no-pg7-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHost + 6), + }, + { + .name = "db7-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 6), + }, + { + .name = "pg8-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHost + 7), + }, + { + .name = "no-pg8-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHost + 7), + }, + { + .name = "db8-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHost + 7), + }, + + // pg-host-cmd option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgHostCmd, + }, + { + .name = "no-pg1-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgHostCmd, + }, + { + .name = "db-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostCmd, + }, + { + .name = "db1-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostCmd, + }, + { + .name = "pg2-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 1), + }, + { + .name = "no-pg2-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostCmd + 1), + }, + { + .name = "db2-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 1), + }, + { + .name = "pg3-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 2), + }, + { + .name = "no-pg3-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostCmd + 2), + }, + { + .name = "db3-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 2), + }, + { + .name = "pg4-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 3), + }, + { + .name = "no-pg4-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostCmd + 3), + }, + { + .name = "db4-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 3), + }, + { + .name = "pg5-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 4), + }, + { + .name = "no-pg5-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostCmd + 4), + }, + { + .name = "db5-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 4), + }, + { + .name = "pg6-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 5), + }, + { + .name = "no-pg6-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostCmd + 5), + }, + { + .name = "db6-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 5), + }, + { + .name = "pg7-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 6), + }, + { + .name = "no-pg7-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostCmd + 6), + }, + { + .name = "db7-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 6), + }, + { + .name = "pg8-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostCmd + 7), + }, + { + .name = "no-pg8-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostCmd + 7), + }, + { + .name = "db8-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + 7), + }, + + // pg-host-config option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgHostConfig, + }, + { + .name = "no-pg1-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgHostConfig, + }, + { + .name = "db-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostConfig, + }, + { + .name = "db1-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostConfig, + }, + { + .name = "pg2-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 1), + }, + { + .name = "no-pg2-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostConfig + 1), + }, + { + .name = "db2-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 1), + }, + { + .name = "pg3-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 2), + }, + { + .name = "no-pg3-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostConfig + 2), + }, + { + .name = "db3-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 2), + }, + { + .name = "pg4-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 3), + }, + { + .name = "no-pg4-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostConfig + 3), + }, + { + .name = "db4-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 3), + }, + { + .name = "pg5-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 4), + }, + { + .name = "no-pg5-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostConfig + 4), + }, + { + .name = "db5-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 4), + }, + { + .name = "pg6-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 5), + }, + { + .name = "no-pg6-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostConfig + 5), + }, + { + .name = "db6-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 5), + }, + { + .name = "pg7-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 6), + }, + { + .name = "no-pg7-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostConfig + 6), + }, + { + .name = "db7-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 6), + }, + { + .name = "pg8-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostConfig + 7), + }, + { + .name = "no-pg8-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostConfig + 7), + }, + { + .name = "db8-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + 7), + }, + + // pg-host-port option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgHostPort, + }, + { + .name = "no-pg1-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgHostPort, + }, + { + .name = "db-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostPort, + }, + { + .name = "db1-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostPort, + }, + { + .name = "pg2-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 1), + }, + { + .name = "no-pg2-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostPort + 1), + }, + { + .name = "db2-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 1), + }, + { + .name = "pg3-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 2), + }, + { + .name = "no-pg3-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostPort + 2), + }, + { + .name = "db3-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 2), + }, + { + .name = "pg4-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 3), + }, + { + .name = "no-pg4-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostPort + 3), + }, + { + .name = "db4-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 3), + }, + { + .name = "pg5-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 4), + }, + { + .name = "no-pg5-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostPort + 4), + }, + { + .name = "db5-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 4), + }, + { + .name = "pg6-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 5), + }, + { + .name = "no-pg6-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostPort + 5), + }, + { + .name = "db6-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 5), + }, + { + .name = "pg7-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 6), + }, + { + .name = "no-pg7-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostPort + 6), + }, + { + .name = "db7-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 6), + }, + { + .name = "pg8-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostPort + 7), + }, + { + .name = "no-pg8-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostPort + 7), + }, + { + .name = "db8-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + 7), + }, + + // pg-host-user option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgHostUser, + }, + { + .name = "no-pg1-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgHostUser, + }, + { + .name = "db-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostUser, + }, + { + .name = "db1-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgHostUser, + }, + { + .name = "pg2-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 1), + }, + { + .name = "no-pg2-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostUser + 1), + }, + { + .name = "db2-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 1), + }, + { + .name = "pg3-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 2), + }, + { + .name = "no-pg3-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostUser + 2), + }, + { + .name = "db3-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 2), + }, + { + .name = "pg4-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 3), + }, + { + .name = "no-pg4-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostUser + 3), + }, + { + .name = "db4-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 3), + }, + { + .name = "pg5-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 4), + }, + { + .name = "no-pg5-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostUser + 4), + }, + { + .name = "db5-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 4), + }, + { + .name = "pg6-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 5), + }, + { + .name = "no-pg6-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostUser + 5), + }, + { + .name = "db6-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 5), + }, + { + .name = "pg7-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 6), + }, + { + .name = "no-pg7-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostUser + 6), + }, + { + .name = "db7-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 6), + }, + { + .name = "pg8-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgHostUser + 7), + }, + { + .name = "no-pg8-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgHostUser + 7), + }, + { + .name = "db8-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + 7), + }, + + // pg-path option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgPath, + }, + { + .name = "no-pg1-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgPath, + }, + { + .name = "db-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgPath, + }, + { + .name = "db1-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgPath, + }, + { + .name = "pg2-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 1), + }, + { + .name = "no-pg2-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPath + 1), + }, + { + .name = "db2-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 1), + }, + { + .name = "pg3-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 2), + }, + { + .name = "no-pg3-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPath + 2), + }, + { + .name = "db3-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 2), + }, + { + .name = "pg4-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 3), + }, + { + .name = "no-pg4-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPath + 3), + }, + { + .name = "db4-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 3), + }, + { + .name = "pg5-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 4), + }, + { + .name = "no-pg5-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPath + 4), + }, + { + .name = "db5-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 4), + }, + { + .name = "pg6-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 5), + }, + { + .name = "no-pg6-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPath + 5), + }, + { + .name = "db6-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 5), + }, + { + .name = "pg7-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 6), + }, + { + .name = "no-pg7-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPath + 6), + }, + { + .name = "db7-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 6), + }, + { + .name = "pg8-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPath + 7), + }, + { + .name = "no-pg8-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPath + 7), + }, + { + .name = "db8-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPath + 7), + }, + + // pg-port option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgPort, + }, + { + .name = "no-pg1-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgPort, + }, + { + .name = "db-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgPort, + }, + { + .name = "db1-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgPort, + }, + { + .name = "pg2-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 1), + }, + { + .name = "no-pg2-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPort + 1), + }, + { + .name = "db2-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 1), + }, + { + .name = "pg3-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 2), + }, + { + .name = "no-pg3-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPort + 2), + }, + { + .name = "db3-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 2), + }, + { + .name = "pg4-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 3), + }, + { + .name = "no-pg4-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPort + 3), + }, + { + .name = "db4-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 3), + }, + { + .name = "pg5-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 4), + }, + { + .name = "no-pg5-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPort + 4), + }, + { + .name = "db5-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 4), + }, + { + .name = "pg6-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 5), + }, + { + .name = "no-pg6-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPort + 5), + }, + { + .name = "db6-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 5), + }, + { + .name = "pg7-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 6), + }, + { + .name = "no-pg7-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPort + 6), + }, + { + .name = "db7-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 6), + }, + { + .name = "pg8-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgPort + 7), + }, + { + .name = "no-pg8-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgPort + 7), + }, + { + .name = "db8-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgPort + 7), + }, + + // pg-socket-path option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "pg1-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptPgSocketPath, + }, + { + .name = "no-pg1-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptPgSocketPath, + }, + { + .name = "db-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgSocketPath, + }, + { + .name = "db1-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptPgSocketPath, + }, + { + .name = "pg2-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 1), + }, + { + .name = "no-pg2-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgSocketPath + 1), + }, + { + .name = "db2-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 1), + }, + { + .name = "pg3-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 2), + }, + { + .name = "no-pg3-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgSocketPath + 2), + }, + { + .name = "db3-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 2), + }, + { + .name = "pg4-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 3), + }, + { + .name = "no-pg4-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgSocketPath + 3), + }, + { + .name = "db4-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 3), + }, + { + .name = "pg5-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 4), + }, + { + .name = "no-pg5-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgSocketPath + 4), + }, + { + .name = "db5-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 4), + }, + { + .name = "pg6-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 5), + }, + { + .name = "no-pg6-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgSocketPath + 5), + }, + { + .name = "db6-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 5), + }, + { + .name = "pg7-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 6), + }, + { + .name = "no-pg7-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgSocketPath + 6), + }, + { + .name = "db7-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 6), + }, + { + .name = "pg8-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | (cfgOptPgSocketPath + 7), + }, + { + .name = "no-pg8-socket-path", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | (cfgOptPgSocketPath + 7), + }, + { + .name = "db8-socket-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + 7), + }, + + // process option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "process", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptProcess, }, + + // process-max option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "process-max", .has_arg = required_argument, @@ -989,6 +1352,9 @@ static const struct option optionList[] = .name = "no-process-max", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptProcessMax, }, + + // protocol-timeout option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "protocol-timeout", .has_arg = required_argument, @@ -998,6 +1364,9 @@ static const struct option optionList[] = .name = "no-protocol-timeout", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptProtocolTimeout, }, + + // recovery-option option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "recovery-option", .has_arg = required_argument, @@ -1007,122 +1376,336 @@ static const struct option optionList[] = .name = "no-recovery-option", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRecoveryOption, }, + + // repo-cipher-pass option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- { - .name = "repo-cipher-pass", + .name = "repo1-cipher-pass", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoCipherPass, }, { - .name = "no-repo-cipher-pass", + .name = "no-repo1-cipher-pass", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoCipherPass, }, { - .name = "repo-cipher-type", + .name = "repo-cipher-pass", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoCipherPass, + }, + + // repo-cipher-type option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-cipher-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoCipherType, }, { - .name = "no-repo-cipher-type", + .name = "no-repo1-cipher-type", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoCipherType, }, { - .name = "repo-path", + .name = "repo-cipher-type", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoCipherType, + }, + + // repo-hardlink option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-hardlink", + .val = PARSE_OPTION_FLAG | cfgOptRepoHardlink, + }, + { + .name = "no-repo1-hardlink", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHardlink, + }, + { + .name = "hardlink", + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoHardlink, + }, + { + .name = "no-hardlink", + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHardlink, + }, + + // repo-host option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptRepoHost, + }, + { + .name = "no-repo1-host", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHost, + }, + { + .name = "backup-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoHost, + }, + + // repo-host-cmd option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-host-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptRepoHostCmd, + }, + { + .name = "no-repo1-host-cmd", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHostCmd, + }, + { + .name = "backup-cmd", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoHostCmd, + }, + + // repo-host-config option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-host-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptRepoHostConfig, + }, + { + .name = "no-repo1-host-config", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHostConfig, + }, + { + .name = "backup-config", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoHostConfig, + }, + + // repo-host-port option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-host-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptRepoHostPort, + }, + { + .name = "no-repo1-host-port", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHostPort, + }, + { + .name = "backup-ssh-port", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoHostPort, + }, + + // repo-host-user option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-host-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | cfgOptRepoHostUser, + }, + { + .name = "no-repo1-host-user", + .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHostUser, + }, + { + .name = "backup-user", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoHostUser, + }, + + // repo-path option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoPath, }, { - .name = "no-repo-path", + .name = "no-repo1-path", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoPath, }, { - .name = "repo-s3-bucket", + .name = "repo-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoPath, + }, + + // repo-s3-bucket option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-bucket", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Bucket, }, { - .name = "no-repo-s3-bucket", + .name = "no-repo1-s3-bucket", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3Bucket, }, { - .name = "repo-s3-ca-file", + .name = "repo-s3-bucket", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3Bucket, + }, + + // repo-s3-ca-file option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-ca-file", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3CaFile, }, { - .name = "no-repo-s3-ca-file", + .name = "no-repo1-s3-ca-file", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3CaFile, }, { - .name = "repo-s3-ca-path", + .name = "repo-s3-ca-file", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3CaFile, + }, + + // repo-s3-ca-path option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-ca-path", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3CaPath, }, { - .name = "no-repo-s3-ca-path", + .name = "no-repo1-s3-ca-path", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3CaPath, }, { - .name = "repo-s3-endpoint", + .name = "repo-s3-ca-path", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3CaPath, + }, + + // repo-s3-endpoint option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-endpoint", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Endpoint, }, { - .name = "no-repo-s3-endpoint", + .name = "no-repo1-s3-endpoint", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3Endpoint, }, { - .name = "repo-s3-host", + .name = "repo-s3-endpoint", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3Endpoint, + }, + + // repo-s3-host option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-host", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Host, }, { - .name = "no-repo-s3-host", + .name = "no-repo1-s3-host", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3Host, }, { - .name = "repo-s3-key", + .name = "repo-s3-host", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3Host, + }, + + // repo-s3-key option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-key", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Key, }, { - .name = "no-repo-s3-key", + .name = "no-repo1-s3-key", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3Key, }, { - .name = "repo-s3-key-secret", + .name = "repo-s3-key", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3Key, + }, + + // repo-s3-key-secret option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-key-secret", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3KeySecret, }, { - .name = "no-repo-s3-key-secret", + .name = "no-repo1-s3-key-secret", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3KeySecret, }, { - .name = "repo-s3-region", + .name = "repo-s3-key-secret", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3KeySecret, + }, + + // repo-s3-region option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-region", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoS3Region, }, { - .name = "no-repo-s3-region", + .name = "no-repo1-s3-region", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3Region, }, { - .name = "repo-s3-verify-ssl", + .name = "repo-s3-region", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3Region, + }, + + // repo-s3-verify-ssl option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-s3-verify-ssl", .val = PARSE_OPTION_FLAG | cfgOptRepoS3VerifySsl, }, { - .name = "no-repo-s3-verify-ssl", + .name = "no-repo1-s3-verify-ssl", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3VerifySsl, }, { - .name = "repo-type", + .name = "repo-s3-verify-ssl", + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoS3VerifySsl, + }, + { + .name = "no-repo-s3-verify-ssl", + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3VerifySsl, + }, + + // repo-type option and deprecations + // ----------------------------------------------------------------------------------------------------------------------------- + { + .name = "repo1-type", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptRepoType, }, { - .name = "no-repo-type", + .name = "no-repo1-type", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoType, }, + { + .name = "repo-type", + .has_arg = required_argument, + .val = PARSE_OPTION_FLAG | PARSE_DEPRECATE_FLAG | cfgOptRepoType, + }, + + // resume option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "resume", .val = PARSE_OPTION_FLAG | cfgOptResume, @@ -1131,6 +1714,9 @@ static const struct option optionList[] = .name = "no-resume", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptResume, }, + + // retention-archive option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "retention-archive", .has_arg = required_argument, @@ -1140,6 +1726,9 @@ static const struct option optionList[] = .name = "no-retention-archive", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRetentionArchive, }, + + // retention-archive-type option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "retention-archive-type", .has_arg = required_argument, @@ -1149,6 +1738,9 @@ static const struct option optionList[] = .name = "no-retention-archive-type", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRetentionArchiveType, }, + + // retention-diff option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "retention-diff", .has_arg = required_argument, @@ -1158,6 +1750,9 @@ static const struct option optionList[] = .name = "no-retention-diff", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRetentionDiff, }, + + // retention-full option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "retention-full", .has_arg = required_argument, @@ -1167,11 +1762,17 @@ static const struct option optionList[] = .name = "no-retention-full", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptRetentionFull, }, + + // set option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "set", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptSet, }, + + // spool-path option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "spool-path", .has_arg = required_argument, @@ -1181,11 +1782,17 @@ static const struct option optionList[] = .name = "no-spool-path", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptSpoolPath, }, + + // stanza option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "stanza", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptStanza, }, + + // start-fast option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "start-fast", .val = PARSE_OPTION_FLAG | cfgOptStartFast, @@ -1194,6 +1801,9 @@ static const struct option optionList[] = .name = "no-start-fast", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptStartFast, }, + + // stop-auto option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "stop-auto", .val = PARSE_OPTION_FLAG | cfgOptStopAuto, @@ -1202,6 +1812,9 @@ static const struct option optionList[] = .name = "no-stop-auto", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptStopAuto, }, + + // tablespace-map option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "tablespace-map", .has_arg = required_argument, @@ -1211,6 +1824,9 @@ static const struct option optionList[] = .name = "no-tablespace-map", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptTablespaceMap, }, + + // tablespace-map-all option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "tablespace-map-all", .has_arg = required_argument, @@ -1220,39 +1836,63 @@ static const struct option optionList[] = .name = "no-tablespace-map-all", .val = PARSE_OPTION_FLAG | PARSE_NEGATE_FLAG | cfgOptTablespaceMapAll, }, + + // target option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "target", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTarget, }, + + // target-action option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "target-action", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTargetAction, }, + + // target-exclusive option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "target-exclusive", .val = PARSE_OPTION_FLAG | cfgOptTargetExclusive, }, + + // target-timeline option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "target-timeline", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTargetTimeline, }, + + // test option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "test", .val = PARSE_OPTION_FLAG | cfgOptTest, }, + + // test-delay option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "test-delay", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTestDelay, }, + + // test-point option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "test-point", .has_arg = required_argument, .val = PARSE_OPTION_FLAG | cfgOptTestPoint, }, + + // type option + // ----------------------------------------------------------------------------------------------------------------------------- { .name = "type", .has_arg = required_argument, diff --git a/src/config/parse.c b/src/config/parse.c index 730cfe5ab..d2cc600dd 100644 --- a/src/config/parse.c +++ b/src/config/parse.c @@ -22,6 +22,9 @@ Parse option flags // Add a flag for negation rather than checking "-no-" #define PARSE_NEGATE_FLAG (1 << 30) +// Indicate that option name has been deprecated and will be removed in a future release +#define PARSE_DEPRECATE_FLAG (1 << 29) + // Mask to exclude all flags and get at the actual option id (only 12 bits allowed for option id, the rest reserved for flags) #define PARSE_OPTION_MASK 0xFFF @@ -41,6 +44,25 @@ typedef struct ParseOption StringList *valueList; // List of values found } ParseOption; +/*********************************************************************************************************************************** +Find an option by name in the option list +***********************************************************************************************************************************/ +static unsigned int +optionFind(const String *option) +{ + unsigned int optionIdx = 0; + + while (optionList[optionIdx].name != NULL) + { + if (strcmp(strPtr(option), optionList[optionIdx].name) == 0) + break; + + optionIdx++; + } + + return optionIdx; +} + /*********************************************************************************************************************************** Parse the command-line arguments and config file to produce final config data ***********************************************************************************************************************************/ @@ -254,15 +276,7 @@ configParse(int argListSize, const char *argList[]) String *key = strLstGet(keyList, keyIdx); // Find the optionName in the main list - unsigned int optionIdx = 0; - - while (optionList[optionIdx].name != NULL) - { - if (strcmp(strPtr(key), optionList[optionIdx].name) == 0) - break; - - optionIdx++; - } + unsigned int optionIdx = optionFind(key); // Warn if the option not found if (optionList[optionIdx].name == NULL) diff --git a/test/README.md b/test/README.md index 18054ab92..5ae7dc09e 100644 --- a/test/README.md +++ b/test/README.md @@ -48,9 +48,9 @@ Note that process-max is only applicable to the `synthetic` and `full` tests in _Run Tests for a Specific OS, Module, Test, Process Max, and Database Version_: ``` -/backrest/test/test.pl --vm=co6 --module=backup --test=full --process-max=4 --db-version=9.4 +/backrest/test/test.pl --vm=co6 --module=backup --test=full --process-max=4 --pg-version=9.4 ``` -Note that db-version is only applicable to the `full` test in the `backup` module. +Note that pg-version is only applicable to the `full` test in the `backup` module. _Iterate All Possible Test Combinations_: ``` diff --git a/test/Vagrantfile b/test/Vagrantfile index aa9744570..cd87b3222 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -5,7 +5,7 @@ Vagrant.configure(2) do |config| end config.vm.box = "ubuntu/xenial64" - config.vm.box_version = "20170603.0.0" + config.vm.box_version = "20180126.0.0" # vagrant plugin install vagrant-disksize # config.disksize.size = '64GB' @@ -60,15 +60,15 @@ Vagrant.configure(2) do |config| pip install --upgrade awscli # Configure AWS CLI - sudo -i -u ubuntu aws configure set region us-east-1 - sudo -i -u ubuntu aws configure set aws_access_key_id accessKey1 - sudo -i -u ubuntu aws configure set aws_secret_access_key verySecretKey1 + sudo -i -u vagrant aws configure set region us-east-1 + sudo -i -u vagrant aws configure set aws_access_key_id accessKey1 + sudo -i -u vagrant aws configure set aws_secret_access_key verySecretKey1 # Create test alias for AWS CLI - echo '' >> /home/ubuntu/.profile - echo '# Test alias for AWS CLI' >> /home/ubuntu/.profile + echo '' >> /home/vagrant/.profile + echo '# Test alias for AWS CLI' >> /home/vagrant/.profile echo 'alias s3-test="export PYTHONWARNINGS=ignore && aws s3 --endpoint-url=https://172.17.0.2 --no-verify-ssl"' \ - >> /home/ubuntu/.profile + >> /home/vagrant/.profile #--------------------------------------------------------------------------------------------------------------------------- echo 'Install Devel::Cover' && date @@ -81,7 +81,7 @@ Vagrant.configure(2) do |config| add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" apt-get update apt-get install -y docker-ce - sudo usermod -aG docker ubuntu + sudo usermod -aG docker vagrant #--------------------------------------------------------------------------------------------------------------------------- echo 'Install Dev Utilities' && date @@ -95,14 +95,14 @@ Vagrant.configure(2) do |config| #--------------------------------------------------------------------------------------------------------------------------- echo 'Create Postgres Group & pgBackRest User' && date groupadd -g5000 postgres - adduser --uid=5001 --ingroup=ubuntu --disabled-password --gecos "" backrest + adduser --uid=5001 --ingroup=vagrant --disabled-password --gecos "" pgbackrest #--------------------------------------------------------------------------------------------------------------------------- echo 'Build VM Images' && date rm -rf /backrest/test/.vagrant/docker/* rm -rf /backrest/test/.vagrant/libc/* rm -rf /backrest/test/.vagrant/package/* - sudo su - ubuntu -c '/backrest/test/test.pl --vm-build' + sudo su - vagrant -c '/backrest/test/test.pl --vm-build' #--------------------------------------------------------------------------------------------------------------------------- echo 'Build End' && date diff --git a/test/expect/archive-stop-001.log b/test/expect/archive-stop-001.log index d63eecb98..096ae48ff 100644 --- a/test/expect/archive-stop-001.log +++ b/test/expect/archive-stop-001.log @@ -4,7 +4,7 @@ run 001 - rmt 0, cmp 0, error version, s3 0, enc 0 stanza-create db - create required data for stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info diff --git a/test/expect/archive-stop-002.log b/test/expect/archive-stop-002.log index ece0e9f78..1f6f05c23 100644 --- a/test/expect/archive-stop-002.log +++ b/test/expect/archive-stop-002.log @@ -4,7 +4,7 @@ run 002 - rmt 0, cmp 1, error version, s3 0, enc 1 stanza-create db - create required data for stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info diff --git a/test/expect/archive-stop-003.log b/test/expect/archive-stop-003.log index 4790473d1..48b8644fe 100644 --- a/test/expect/archive-stop-003.log +++ b/test/expect/archive-stop-003.log @@ -4,7 +4,7 @@ run 003 - rmt 1, cmp 0, error version, s3 0, enc 0 stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info diff --git a/test/expect/archive-stop-004.log b/test/expect/archive-stop-004.log index dbcd36903..7ec65df3f 100644 --- a/test/expect/archive-stop-004.log +++ b/test/expect/archive-stop-004.log @@ -4,7 +4,7 @@ run 004 - rmt 1, cmp 0, error connect, s3 0, enc 0 stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -42,11 +42,11 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --backup-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --repo1-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ P00 ERROR: [042]: remote process on 'bogus' terminated unexpectedly: ssh: Could not resolve hostname bogus: Name or service not known -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --backup-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000003 +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --repo1-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000003 ------------------------------------------------------------------------------------------------------------------------------------ P00 ERROR: [042]: remote process on 'bogus' terminated unexpectedly: ssh: Could not resolve hostname bogus: Name or service not known diff --git a/test/expect/archive-stop-005.log b/test/expect/archive-stop-005.log index a9edeae52..8fe31f082 100644 --- a/test/expect/archive-stop-005.log +++ b/test/expect/archive-stop-005.log @@ -4,7 +4,7 @@ run 005 - rmt 1, cmp 1, error version, s3 0, enc 1 stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info diff --git a/test/expect/archive-stop-006.log b/test/expect/archive-stop-006.log index bb6392be2..df40405a8 100644 --- a/test/expect/archive-stop-006.log +++ b/test/expect/archive-stop-006.log @@ -4,7 +4,7 @@ run 006 - rmt 1, cmp 1, error connect, s3 0, enc 1 stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -48,11 +48,11 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --backup-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --repo1-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ P00 ERROR: [042]: remote process on 'bogus' terminated unexpectedly: ssh: Could not resolve hostname bogus: Name or service not known -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --backup-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000003 +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --repo1-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000003 ------------------------------------------------------------------------------------------------------------------------------------ P00 ERROR: [042]: remote process on 'bogus' terminated unexpectedly: ssh: Could not resolve hostname bogus: Name or service not known diff --git a/test/expect/archive-stop-007.log b/test/expect/archive-stop-007.log index da4dc1390..851d49d27 100644 --- a/test/expect/archive-stop-007.log +++ b/test/expect/archive-stop-007.log @@ -4,7 +4,7 @@ run 007 - rmt 1, cmp 0, error connect, s3 1, enc 0 stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -42,11 +42,11 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --backup-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --repo1-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ P00 ERROR: [042]: remote process on 'bogus' terminated unexpectedly: ssh: Could not resolve hostname bogus: Name or service not known -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --backup-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000003 +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --archive-queue-max=33554432 --stanza=db --repo1-host=bogus archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000003 ------------------------------------------------------------------------------------------------------------------------------------ P00 ERROR: [042]: remote process on 'bogus' terminated unexpectedly: ssh: Could not resolve hostname bogus: Name or service not known diff --git a/test/expect/expire-expire-001.log b/test/expect/expire-expire-001.log index 4af0589b9..6be2cc75c 100644 --- a/test/expect/expire-expire-001.log +++ b/test/expect/expire-expire-001.log @@ -297,7 +297,7 @@ db-version="9.2" Nothing to expire > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=1 --retention-diff=1 --retention-archive-type=full --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --retention-diff=1 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --retention-diff=1 --retention-full=1 --stanza=db P00 DETAIL: archive retention on backup [BACKUP-FULL-1], archiveId = 9.2-1, start = 000000010000000000000000 P00 DETAIL: no archive to remove, archiveId = 9.2-1 P00 INFO: expire command end: completed successfully @@ -896,7 +896,7 @@ db-version="9.2" Expire oldest full backup, archive expire falls on segment major boundary > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=1 --retention-diff=1 --retention-archive-type=full --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --retention-diff=1 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --retention-diff=1 --retention-full=1 --stanza=db P00 INFO: expire full backup set: [BACKUP-FULL-1], [BACKUP-INCR-1] P00 INFO: remove expired backup [BACKUP-INCR-1] P00 INFO: remove expired backup [BACKUP-FULL-1] @@ -1258,7 +1258,7 @@ db-version="9.2" Expire oldest full backup > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=1 --retention-diff=1 --retention-archive-type=full --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --retention-diff=1 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --retention-diff=1 --retention-full=1 --stanza=db P00 INFO: expire diff backup [BACKUP-DIFF-1] P00 INFO: remove expired backup [BACKUP-DIFF-1] P00 DETAIL: archive retention on backup [BACKUP-FULL-2], archiveId = 9.2-1, start = 000000010000000100000000 @@ -1907,7 +1907,7 @@ db-version="9.2" Expire oldest diff backup, archive expire does not fall on major segment boundary > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=1 --retention-diff=1 --retention-archive-type=diff --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=1 --stanza=db P00 INFO: expire full backup set: [BACKUP-FULL-2], [BACKUP-DIFF-2] P00 INFO: remove expired backup [BACKUP-DIFF-2] P00 INFO: remove expired backup [BACKUP-FULL-2] @@ -2025,7 +2025,7 @@ db-version="9.2" Expire oldest diff backup (cascade to incr) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=1 --retention-diff=1 --retention-archive-type=diff --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=1 --stanza=db P00 INFO: expire diff backup set: [BACKUP-DIFF-3], [BACKUP-INCR-2] P00 INFO: remove expired backup [BACKUP-INCR-2] P00 INFO: remove expired backup [BACKUP-DIFF-3] @@ -2134,7 +2134,7 @@ db-version="9.2" Expire archive based on newest incr backup > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=1 --retention-diff=1 --retention-archive-type=incr --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=incr --retention-diff=1 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=incr --retention-diff=1 --retention-full=1 --stanza=db P00 DETAIL: archive retention on backup [BACKUP-FULL-3], archiveId = 9.2-1, start = 000000010000000200000010, stop = 000000010000000200000012 P00 DETAIL: archive retention on backup [BACKUP-DIFF-4], archiveId = 9.2-1, start = 00000001000000020000001E, stop = 000000010000000200000020 P00 DETAIL: archive retention on backup [BACKUP-INCR-3], archiveId = 9.2-1, start = 000000010000000200000024 @@ -2269,7 +2269,7 @@ db-version="9.2" Expire diff treating full as diff > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=2 --retention-diff=1 --retention-archive-type=diff --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=2 --stanza=db P00 INFO: expire full backup set: [BACKUP-FULL-3], [BACKUP-DIFF-4], [BACKUP-INCR-3] P00 INFO: expire diff backup [BACKUP-DIFF-5] P00 INFO: remove expired backup [BACKUP-DIFF-5] @@ -2400,7 +2400,7 @@ db-version="9.2" Expire diff with retention-archive with warning retention-diff not set > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-archive-type=diff --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --stanza=db P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: option 'retention-diff' is not set for 'retention-archive-type=diff' @@ -2554,7 +2554,7 @@ db-version="9.2" Expire full with retention-archive with warning retention-full not set > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-archive-type=full --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=full --stanza=db P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DETAIL: archive retention on backup [BACKUP-FULL-4], archiveId = 9.2-1, start = 00000001000000020000002A, stop = 00000001000000020000002C @@ -2718,7 +2718,7 @@ db-version="9.2" Expire no archive with warning since retention-archive not set for INCR > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=1 --retention-diff=1 --retention-archive-type=incr expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive-type=incr --retention-diff=1 --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive-type=incr --retention-diff=1 --retention-full=1 --stanza=db P00 WARN: WAL segments will not be expired: option 'retention-archive-type=incr' but option 'retention-archive' is not set P00 INFO: expire full backup [BACKUP-FULL-4] P00 INFO: expire full backup [BACKUP-FULL-5] @@ -2893,7 +2893,7 @@ db-version="9.2" Expire no archive with warning since neither retention-archive nor retention-diff is set > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-archive-type=diff expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive-type=diff --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive-type=diff --stanza=db P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: WAL segments will not be expired: option 'retention-archive-type=diff' but neither option 'retention-archive' nor option 'retention-diff' is set @@ -3079,7 +3079,7 @@ db-version="9.2" Use oldest full backup for archive retention > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=10 --retention-diff=10 --retention-archive-type=full --retention-archive=10 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=10 --retention-archive-type=full --retention-diff=10 --retention-full=10 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=10 --retention-archive-type=full --retention-diff=10 --retention-full=10 --stanza=db P00 INFO: full backup total < 10 - using oldest full backup for 9.2-1 archive retention P00 DETAIL: archive retention on backup [BACKUP-FULL-8], archiveId = 9.2-1, start = 000000010000000200000054 P00 DETAIL: remove archive: archiveId = 9.2-1, start = 00000001000000020000002A, stop = 000000010000000200000050 diff --git a/test/expect/expire-expire-002.log b/test/expect/expire-expire-002.log index 2f4cce2f4..9da021194 100644 --- a/test/expect/expire-expire-002.log +++ b/test/expect/expire-expire-002.log @@ -63,7 +63,7 @@ db-version="9.2" Create backups in current db version > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-archive-type=diff expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive-type=diff --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive-type=diff --stanza=db P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: WAL segments will not be expired: option 'retention-archive-type=diff' but neither option 'retention-archive' nor option 'retention-diff' is set @@ -469,7 +469,7 @@ db-version="9.3" Upgrade stanza and expire only earliest db backup and archive > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=3 --retention-archive-type=full expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive-type=full --retention-full=3 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive-type=full --retention-full=3 --stanza=db P00 INFO: expire full backup set: [BACKUP-FULL-1], [BACKUP-INCR-1] P00 INFO: remove expired backup [BACKUP-INCR-1] P00 INFO: remove expired backup [BACKUP-FULL-1] @@ -1137,7 +1137,7 @@ db-version="10" Upgrade the stanza, create full back - earliest db orphaned archive removed and earliest full backup and archive in previous db version removed > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=2 --retention-archive-type=full expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive-type=full --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive-type=full --retention-full=2 --stanza=db P00 INFO: expire full backup [BACKUP-FULL-2] P00 INFO: expire full backup set: [BACKUP-FULL-3], [BACKUP-INCR-2] P00 INFO: remove expired backup [BACKUP-INCR-2] @@ -1287,7 +1287,7 @@ db-version="10" Expire all archive last full backup through pitr > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=3 --retention-diff=1 --retention-archive-type=diff --retention-archive=1 expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=3 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=1 --retention-archive-type=diff --retention-diff=1 --retention-full=3 --stanza=db P00 INFO: expire diff backup [BACKUP-DIFF-1] P00 INFO: remove expired backup [BACKUP-DIFF-1] P00 DETAIL: archive retention on backup [BACKUP-FULL-4], archiveId = 9.3-2, start = 0000000100000000000000FF @@ -1430,7 +1430,7 @@ db-version="10" Expire all archive except for the current database > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config="[TEST_PATH]/db-master/pgbackrest.conf" --stanza=db --log-level-console=detail --retention-full=2 --retention-archive-type=full expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive-type=full --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive-type=full --retention-full=2 --stanza=db P00 INFO: expire full backup [BACKUP-FULL-4] P00 INFO: remove expired backup [BACKUP-FULL-4] P00 INFO: remove archive path: [TEST_PATH]/db-master/repo/archive/db/9.3-2 diff --git a/test/expect/mock-all-001.log b/test/expect/mock-all-001.log index 400570f67..1e45f163e 100644 --- a/test/expect/mock-all-001.log +++ b/test/expect/mock-all-001.log @@ -14,7 +14,7 @@ info all stanzas - no stanzas exist (db-master host) stanza-create db - create required data for stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -52,7 +52,7 @@ db-version="9.4" full backup - error on identical link destinations (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [070]: link [TEST_PATH]/db-master/db/base/postgresql.conf (../pg_config) references a subdirectory of or the same directory as link [TEST_PATH]/db-master/db/base/pg_config_bad (../../db/pg_config) @@ -61,16 +61,16 @@ P00 INFO: backup command end: aborted with exception [070] full backup - error on link to a link (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [070]: link '[TEST_PATH]/db-master/db/base/postgresql.conf.bad' -> '../pg_config/postgresql.conf.link' cannot reference another link P00 INFO: backup command end: aborted with exception [070] full backup - create pg_stat link, pg_clog dir (db-master host) -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --manifest-save-threshold=3 --buffer-size=16384 --checksum-page --process-max=1 --repo-type=cifs --type=full --stanza=db backup +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --manifest-save-threshold=3 --buffer-size=16384 --checksum-page --process-max=1 --repo1-type=cifs --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --buffer-size=16384 --checksum-page --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --manifest-save-threshold=3 --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --repo-type=cifs --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --buffer-size=16384 --checksum-page --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --manifest-save-threshold=3 --no-online --pg1-path=[TEST_PATH]/db-master/db/base --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --repo1-type=cifs --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -162,8 +162,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 --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --repo-type=cifs --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --repo-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 --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --repo1-type=cifs --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/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 @@ -278,7 +278,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/db-master/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 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --repo-type=cifs --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --buffer-size=16384 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --repo1-type=cifs --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/db-master/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/db-master/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -315,7 +315,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress=n @@ -327,7 +327,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -444,13 +444,13 @@ full backup - invalid cmd line (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --type=full --stanza=bogus backup ------------------------------------------------------------------------------------------------------------------------------------ STDERR: -ERROR: [037]: backup command requires option: db1-path +ERROR: [037]: backup command requires option: pg1-path HINT: does this stanza exist? stop all stanzas (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo 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]/db-master/lock @@ -465,7 +465,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - abort backup - local (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --type=full --stanza=db backup --test --test-delay=5 --test-point=backup-start=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=5 --test-point=backup-start=y --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=5 --test-point=backup-start=y --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -548,7 +548,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 63 full backup - global stop (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -568,7 +568,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 62 stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/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]/db-master/lock @@ -582,7 +582,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/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]/db-master/lock @@ -597,7 +597,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - stanza stop (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -617,7 +617,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 62 start db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 0, oException = [undef], strSignal = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy=>: iExitStatus = 0 @@ -628,7 +628,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 start all stanzas (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 0, oException = [undef], strSignal = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy=>: iExitStatus = 0 @@ -639,7 +639,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 start all stanzas (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo P00 WARN: stop file does not exist P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 0, oException = [undef], strSignal = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef] @@ -651,7 +651,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - resume (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --force --checksum-page --type=full --stanza=db backup --test --test-delay=0.2 --test-point=backup-resume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -772,8 +772,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, 184473f470864e067ee3a22e64b47b0a1c356f29, 0, [BACKUP-FULL-2], 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-2], 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] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --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 @@ -839,7 +839,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/db-master/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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/db-master/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/db-master/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -876,7 +876,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress=n @@ -888,7 +888,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -1002,18 +1002,18 @@ db-version="9.4" 1={"db-catalog-version":201409291,"db-control-version":942,"db-system-id":1000000000000000094,"db-version":"9.4"} full backup - invalid repo (db-master host) -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --repo-path=/bogus_path --log-level-console=detail --type=full --stanza=db backup +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --repo1-path=/bogus_path --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/bogus_path --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=/bogus_path --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. -P00 ERROR: [073]: repo-path '/bogus_path' does not exist +P00 ERROR: [073]: repo1-path '/bogus_path' does not exist P00 INFO: backup command end: aborted with exception [073] restore delta, backup '[BACKUP-FULL-2]' - add and delete files (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-2] --link-all --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = P00 DEBUG: Storage::Local->new(): bAllowTemp = , hRule = [hash], lBufferMax = 4194304, oDriver = [object], strCipherPassUser = [undef], strCipherType = [undef], strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strPathBase = [TEST_PATH]/db-master/repo, strTempExtension = pgbackrest.tmp P00 DEBUG: Storage::Local->pathExists(): strPathExp = @@ -1210,8 +1210,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, 3, [MODIFICATION-TIME-1], 184473f470864e067ee3a22e64b47b0a1c356f29, 0, 0, pg_data/base/1/PG_VERSION, [undef], 0660, root, [USER-1], [MODIFICATION-TIME-3], 1, [BACKUP-FULL-2], 0), rParamSecure = [undef], strKey = pg_data/base/1/PG_VERSION, strOp = restoreFile, strQueue = pg_data P00 DEBUG: Protocol::Local::Process->queueJob(): iHostConfigIdx = 1, rParam = ([TEST_PATH]/db-master/db/base/PG_VERSION, 3, [MODIFICATION-TIME-1], 184473f470864e067ee3a22e64b47b0a1c356f29, 0, 0, pg_data/PG_VERSION, [undef], 0600, [USER-1], [GROUP-1], [MODIFICATION-TIME-3], 1, [BACKUP-FULL-2], 0), rParamSecure = [undef], strKey = pg_data/PG_VERSION, strOp = restoreFile, strQueue = pg_data P00 DEBUG: Protocol::Local::Process->hostConnect: start local process: iHostConfigIdx = 1, iHostIdx = 0, iHostProcessIdx = 0, iProcessId = 1, strHostType = backup -P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=restore --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=backup local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=restore --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=backup local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=restore --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --type=backup local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=restore --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --type=backup 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 @@ -1292,7 +1292,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, backup '[BACKUP-FULL-2]' - fix permissions (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-2] --link-all --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: backup group for pg_data/base/16384/PG_VERSION was not mapped to a name, set to [GROUP-1] P00 WARN: backup user for pg_data/base/1/PG_VERSION was not mapped to a name, set to [USER-1] @@ -1328,7 +1328,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, backup '[BACKUP-FULL-2]' - fix broken symlink (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-2] --link-all --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: backup group for pg_data/base/16384/PG_VERSION was not mapped to a name, set to [GROUP-1] P00 WARN: backup user for pg_data/base/1/PG_VERSION was not mapped to a name, set to [USER-1] @@ -1363,7 +1363,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, backup '[BACKUP-FULL-2]' - restore all links by mapping (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-2] --log-level-console=detail --link-map=pg_stat=../pg_stat --link-map=postgresql.conf=../pg_config/postgresql.conf --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --link-map=pg_stat=../pg_stat --link-map=postgresql.conf=../pg_config/postgresql.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --link-map=pg_stat=../pg_stat --link-map=postgresql.conf=../pg_config/postgresql.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: backup group for pg_data/base/16384/PG_VERSION was not mapped to a name, set to [GROUP-1] P00 WARN: backup user for pg_data/base/1/PG_VERSION was not mapped to a name, set to [USER-1] @@ -1427,7 +1427,7 @@ P00 ERROR: [038]: unable to restore while PostgreSQL is running restore delta, backup '[BACKUP-FULL-2]' - restore all links --link-all and mapping (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-2] --log-level-console=detail --link-map=pg_stat=../pg_stat --link-all --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --link-all --link-map=pg_stat=../pg_stat --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --link-all --link-map=pg_stat=../pg_stat --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: backup group for pg_data/base/16384/PG_VERSION was not mapped to a name, set to [GROUP-1] P00 WARN: backup user for pg_data/base/1/PG_VERSION was not mapped to a name, set to [USER-1] @@ -1459,7 +1459,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, force, backup '[BACKUP-FULL-2]', expect exit 40 - fail on missing PG_VERSION (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --set=[BACKUP-FULL-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db P00 WARN: --delta or --force specified but unable to find 'PG_VERSION' or 'backup.manifest' in '[TEST_PATH]/db-master/db/base' to confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist in the destination directories the restore will be aborted. P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: backup group for pg_data/base/16384/PG_VERSION was not mapped to a name, set to [GROUP-1] @@ -1473,7 +1473,7 @@ P00 INFO: restore command end: aborted with exception [040] restore delta, force, backup '[BACKUP-FULL-2]' - restore succeeds with backup.manifest file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --set=[BACKUP-FULL-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: backup group for pg_data/base/16384/PG_VERSION was not mapped to a name, set to [GROUP-1] P00 WARN: group bogus in manifest cannot be used for restore, set to [USER-1] @@ -1510,7 +1510,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf incr backup - invalid database version (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database version = 9.4, system-id 1000000000000000094 does not match backup version = 8.0, system-id = 1000000000000000094 @@ -1520,7 +1520,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid system id (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database version = 9.4, system-id 1000000000000000094 does not match backup version = 9.4, system-id = 6999999999999999999 @@ -1530,7 +1530,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid control version (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database control-version = 942, catalog-version 201409291 does not match backup control-version = 842, catalog-version = 201409291 @@ -1540,7 +1540,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid catalog version (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database control-version = 942, catalog-version 201409291 does not match backup control-version = 942, catalog-version = 197208141 @@ -1550,7 +1550,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid path in pg_tblspc (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1561,7 +1561,7 @@ P00 INFO: backup command end: aborted with exception [069] incr backup - invalid relative tablespace is ../ (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1572,7 +1572,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - invalid relative tablespace is .. (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1583,7 +1583,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - invalid relative tablespace is ../../$PGDATA (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1594,7 +1594,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - invalid relative tablespace is ../../$PGDATA (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1605,7 +1605,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - tablespace link references a link (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1616,7 +1616,7 @@ P00 INFO: backup command end: aborted with exception [070] incr backup - invalid relative tablespace in $PGDATA (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1627,7 +1627,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - $PGDATA is a substring of valid tblspc excluding / (file missing err expected) (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1638,7 +1638,7 @@ P00 INFO: backup command end: aborted with exception [055] incr backup - invalid tablespace in $PGDATA (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1649,7 +1649,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - add tablespace 1 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --test --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -1753,8 +1753,8 @@ P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/16384/PG P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/1/PG_VERSION to [BACKUP-FULL-2] P00 DEBUG: Backup::Backup->processManifest: reference pg_data/PG_VERSION to [BACKUP-FULL-2] 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] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --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 = 1 P00 DEBUG: Protocol::Local::Process->init=>: bResult = true @@ -1791,7 +1791,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/db-master/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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/db-master/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/db-master/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -1836,7 +1836,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress=n @@ -1848,7 +1848,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -1970,7 +1970,7 @@ db-version="9.4" incr backup - resume and add tablespace 2 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --process-max=1 --stanza=db backup --test --test-delay=0.2 --test-point=backup-resume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -2101,8 +2101,8 @@ P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/16384/PG P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/1/PG_VERSION to [BACKUP-FULL-2] P00 DEBUG: Backup::Backup->processManifest: reference pg_data/PG_VERSION to [BACKUP-FULL-2] 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] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 3, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --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 = 2 P00 DEBUG: Protocol::Local::Process->init=>: bResult = true @@ -2143,7 +2143,7 @@ P00 DEBUG: Storage::Local->openWrite(): bAtomic = , bPathCreate = pathSync(): bRecurse = , strPathExp = [TEST_PATH]/db-master/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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Backup::Info->new(): bIgnoreMissing = , bLoad = , bRequired = , bValidate = , oStorage = <[object]>, strBackupClusterPath = [TEST_PATH]/db-master/repo/backup/db, strCipherPassSub = [undef] P00 DEBUG: Storage::Local->encrypted(): bIgnoreMissing = true, strFileName = [TEST_PATH]/db-master/repo/backup/db/backup.info P00 DEBUG: Storage::Local->encrypted=>: bEncrypted = false @@ -2188,7 +2188,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress=n @@ -2200,7 +2200,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -2332,7 +2332,7 @@ db-version="9.4" diff backup - cannot resume - new diff (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --type=diff --stanza=db backup --test --test-delay=0.2 --test-point=backup-noresume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: backup [BACKUP-INCR-2] missing manifest removed from backup.info @@ -2348,14 +2348,14 @@ P00 WARN: page misalignment in file [TEST_PATH]/db-master/db/base/pg_tblspc/1/ 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress=n @@ -2367,7 +2367,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -2495,7 +2495,7 @@ db-version="9.4" diff backup - cannot resume - disabled / no repo link (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --no-resume --log-level-console=detail --process-max=1 --type=diff --stanza=db backup --test --test-delay=0.2 --test-point=backup-noresume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --no-resume --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --no-resume --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: backup [BACKUP-DIFF-1] missing manifest removed from backup.info @@ -2511,14 +2511,14 @@ P00 WARN: page misalignment in file [TEST_PATH]/db-master/db/base/pg_tblspc/1/ 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress=n @@ -2530,7 +2530,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -2658,7 +2658,7 @@ db-version="9.4" restore, backup '[BACKUP-DIFF-2]', expect exit 40 - fail on used path (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --set=[BACKUP-DIFF-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-DIFF-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-DIFF-2] --stanza=db P00 INFO: restore backup set [BACKUP-DIFF-2] P00 DETAIL: check [TEST_PATH]/db-master/db/base exists P00 ERROR: [040]: cannot restore to path '[TEST_PATH]/db-master/db/base' that contains files - try using --delta if this is what you intended @@ -2667,7 +2667,7 @@ P00 INFO: restore command end: aborted with exception [040] restore, backup '[BACKUP-DIFF-2]', remap - remap all paths (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --set=[BACKUP-DIFF-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-2] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2 P00 INFO: remap tablespace pg_tblspc/1 directory to [TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -2701,7 +2701,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, backup '[BACKUP-DIFF-2]', remap - ensure file in tblspc root remains after --delta (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-DIFF-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-2] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2 P00 INFO: remap tablespace pg_tblspc/1 directory to [TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -2739,7 +2739,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf incr backup - add files and remove tablespace 2 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-DIFF-2], version = [VERSION-1] @@ -2751,14 +2751,14 @@ P00 WARN: page misalignment in file [TEST_PATH]/db-master/db/base-2/base/base2 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -2774,7 +2774,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -2899,7 +2899,7 @@ db-version="9.4" incr backup - update files - fail on missing backup.info (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [055]: unable to open [TEST_PATH]/db-master/repo/backup/db/backup.info or [TEST_PATH]/db-master/repo/backup/db/backup.info.copy @@ -2910,7 +2910,7 @@ P00 INFO: backup command end: aborted with exception [055] stanza-create db - fail on backup directory missing backup.info (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [055]: backup information missing HINT: use stanza-create --force to force the stanza data to be recreated. P00 INFO: stanza-create command end: aborted with exception [055] @@ -2933,7 +2933,7 @@ db-version="9.4" stanza-create db - create required data for stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -2976,7 +2976,7 @@ db-version="9.4" incr backup - update files (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-INCR-3], version = [VERSION-1] @@ -2986,14 +2986,14 @@ P00 WARN: page misalignment in file [TEST_PATH]/db-master/db/base-2/base/16384 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -3009,7 +3009,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -3135,7 +3135,7 @@ db-version="9.4" diff backup - updates since last full (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -3152,14 +3152,14 @@ P00 WARN: page misalignment in file [TEST_PATH]/db-master/db/base-2/pg_tblspc/ 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -3175,7 +3175,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -3302,7 +3302,7 @@ db-version="9.4" incr backup - remove files - but won't affect manifest (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-DIFF-3], version = [VERSION-1] @@ -3312,14 +3312,14 @@ 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -3335,7 +3335,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -3463,7 +3463,7 @@ db-version="9.4" diff backup - remove files during backup (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --type=diff --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --hardlink --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --process-max=1 --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -3480,14 +3480,14 @@ P00 WARN: page misalignment in file [TEST_PATH]/db-master/db/base-2/pg_tblspc/ 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -3497,14 +3497,14 @@ tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 compress=y compress-level=3 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/db-master/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -3631,7 +3631,7 @@ db-version="9.4" full backup - update file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --hardlink --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P01 INFO: backup file [TEST_PATH]/db-master/db/base-2/base/32768/33001 (64KB, 44%) checksum 6bf316f11d28c28914ea9be92c00de9bea6d9a6b @@ -3652,14 +3652,14 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base-2/pg_tblspc/2/[TS_PATH-1]/ 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -3669,14 +3669,14 @@ tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 compress=y compress-level=3 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/db-master/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -4147,7 +4147,7 @@ info db stanza - normal output (db-master host) expire full=1 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --retention-full=1 --stanza=db expire ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-full=1 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/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] @@ -4161,7 +4161,7 @@ P00 INFO: expire command end: completed successfully diff backup - add file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=detail --checksum-page --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --hardlink --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-3], version = [VERSION-1] @@ -4184,14 +4184,14 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base-2/base/base2.txt (9B, 100% 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -4201,14 +4201,14 @@ tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 compress=y compress-level=3 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/db-master/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -4332,7 +4332,7 @@ db-version="9.4" restore delta, remap - selective restore 16384 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --log-level-console=detail --db-include=16384 --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=16384=1 --db1-path=[TEST_PATH]/db-master/db/base-2 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=16384=1 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap tablespace pg_tblspc/2 directory to [TEST_PATH]/db-master/db/tablespace/ts2-2 P00 DETAIL: check [TEST_PATH]/db-master/db/base-2 exists @@ -4369,7 +4369,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, remap - selective restore 32768 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --log-level-console=detail --db-include=32768 --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=32768=1 --db1-path=[TEST_PATH]/db-master/db/base-2 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=32768=1 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap tablespace pg_tblspc/2 directory to [TEST_PATH]/db-master/db/tablespace/ts2-2 P00 DETAIL: check [TEST_PATH]/db-master/db/base-2 exists @@ -4416,7 +4416,7 @@ P00 ERROR: [081]: system databases (template0, postgres, etc.) are included by restore, remap, expect exit 73 - no tablespace remap - error when tablespace dir does not exist (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --tablespace-map-all=../../tablespace --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2/base --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map-all=../../tablespace +P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map-all=../../tablespace P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2/base P00 INFO: remap tablespace pg_tblspc/2 directory to ../../tablespace/ts2 @@ -4428,7 +4428,7 @@ P00 INFO: restore command end: aborted with exception [073] restore - no tablespace remap (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --tablespace-map-all=../../tablespace --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2/base --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map-all=../../tablespace +P00 INFO: restore command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --tablespace-map-all=../../tablespace P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2/base P00 INFO: remap tablespace pg_tblspc/2 directory to ../../tablespace/ts2 @@ -4630,7 +4630,7 @@ diff backup - config file warning on local (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=info 2>&1 --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ WARN: '[TEST_PATH]/db-master/pgbackrest.conf' contains invalid option 'bogus' -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2/base --db-timeout=45 --hardlink --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2/base --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-3], version = [VERSION-1] @@ -4638,14 +4638,14 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base-2/base/base/base2.txt (9B, 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2/base +pg1-path=[TEST_PATH]/db-master/db/base-2/base [db:restore] @@ -4653,14 +4653,14 @@ db-path=[TEST_PATH]/db-master/db/base-2/base compress=y compress-level=3 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/db-master/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -4786,7 +4786,7 @@ db-version="9.4" diff backup - option backup-standby reset - backup performed from master (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --no-online --log-level-console=info --backup-standby --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --backup-standby --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2/base --db-timeout=45 --hardlink --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --backup-standby --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base-2/base --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/db-master/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: option backup-standby is enabled but standby is not properly configured - backups will be performed from the master @@ -4795,14 +4795,14 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base-2/base/base/base2.txt (9B, 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: option 'retention-archive' is not set - archive logs will not be expired P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2/base +pg1-path=[TEST_PATH]/db-master/db/base-2/base [db:restore] @@ -4810,14 +4810,14 @@ db-path=[TEST_PATH]/db-master/db/base-2/base compress=y compress-level=3 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/db-master/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] diff --git a/test/expect/mock-all-002.log b/test/expect/mock-all-002.log index a134b2666..3e928a41a 100644 --- a/test/expect/mock-all-002.log +++ b/test/expect/mock-all-002.log @@ -14,7 +14,7 @@ info all stanzas - no stanzas exist (db-master host) stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -52,7 +52,7 @@ db-version="9.4" full backup - error on identical link destinations (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [070]: link [TEST_PATH]/db-master/db/base/postgresql.conf (../pg_config) references a subdirectory of or the same directory as link [TEST_PATH]/db-master/db/base/pg_config_bad (../../db/pg_config) @@ -61,16 +61,16 @@ P00 INFO: backup command end: aborted with exception [070] full backup - error on link to a link (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [070]: link '[TEST_PATH]/db-master/db/base/postgresql.conf.bad' -> '../pg_config/postgresql.conf.link' cannot reference another link P00 INFO: backup command end: aborted with exception [070] full backup - create pg_stat link, pg_clog dir (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --manifest-save-threshold=3 --protocol-timeout=2 --db-timeout=1 --cmd-ssh=/usr/bin/ssh --db1-port=[PORT-1] --db1-socket-path =/test_socket_path --buffer-size=16384 --checksum-page --process-max=1 --repo-type=cifs --type=full --stanza=db backup +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --manifest-save-threshold=3 --protocol-timeout=2 --db-timeout=1 --cmd-ssh=/usr/bin/ssh --pg1-port=9999 --pg1-socket-path =/test_socket_path --buffer-size=16384 --checksum-page --process-max=1 --repo1-type=cifs --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --buffer-size=16384 --checksum-page --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db1-port=[PORT-1] --db1-socket-path==/test_socket_path --db-timeout=1 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --manifest-save-threshold=3 --no-online --process-max=1 --protocol-timeout=2 --repo-path=[TEST_PATH]/backup/repo --repo-type=cifs --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --buffer-size=16384 --checksum-page --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=1 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --manifest-save-threshold=3 --no-online --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-max=1 --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -103,9 +103,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db1-port=[PORT-1] --db1-socket-path==/test_socket_path --db-timeout=1 --protocol-timeout=2 --repo-path=[TEST_PATH]/backup/repo --repo-type=cifs --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 2, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db1-port=[PORT-1] --db1-socket-path==/test_socket_path --db-timeout=1 --protocol-timeout=2 --repo-path=[TEST_PATH]/backup/repo --repo-type=cifs --stanza=db --type=db remote, strCommandSSH = /usr/bin/ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 2, strCommand = /usr/bin/ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db1-port=[PORT-1] --db1-socket-path==/test_socket_path --db-timeout=1 --protocol-timeout=2 --repo-path=[TEST_PATH]/backup/repo --repo-type=cifs --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=1 --pg1-path=[TEST_PATH]/db-master/db/base --pg1-port=9999 --pg1-socket-path==/test_socket_path --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 2, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=1 --pg1-path=[TEST_PATH]/db-master/db/base --pg1-port=9999 --pg1-socket-path==/test_socket_path --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --type=db remote, strCommandSSH = /usr/bin/ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 16384, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 2, strCommand = /usr/bin/ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=16384 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=1 --pg1-path=[TEST_PATH]/db-master/db/base --pg1-port=9999 --pg1-socket-path==/test_socket_path --protocol-timeout=2 --repo1-path=[TEST_PATH]/backup/repo --repo1-type=cifs --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 DEBUG: Db::dbObjectGet=>: iDbMasterIdx = 1, iDbStandbyIdx = [undef], oDbMaster = [object], oDbStandby = [undef] P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: found cached protocol @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db1-socket-path==/test_socket_path --db-timeout=1 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=2 --repo-path=[TEST_PATH]/backup/repo --repo-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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db1-socket-path==/test_socket_path --db-timeout=1 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=2 --repo-path=[TEST_PATH]/backup/repo --repo-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-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::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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-path=[TEST_PATH]/backup/repo --repo-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 --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 @@ -319,13 +319,9 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -336,16 +332,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -358,7 +358,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -471,7 +471,7 @@ P00 TEST: PgBaCkReStTeSt-BACKUP-START-PgBaCkReStTeSt stop all stanzas (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --force stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --config=[TEST_PATH]/db-master/pgbackrest.conf --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] 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]/db-master/lock @@ -486,7 +486,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - abort backup - local (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --type=full --stanza=db backup --test --test-delay=5 --test-point=backup-start=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=5 --test-point=backup-start=y --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=5 --test-point=backup-start=y --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -529,9 +529,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 DEBUG: Db::dbObjectGet=>: iDbMasterIdx = 1, iDbStandbyIdx = [undef], oDbMaster = [object], oDbStandby = [undef] P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: found cached protocol @@ -594,7 +594,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 63 full backup - global stop (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -637,9 +637,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 ERROR: [062]: raised from remote process on 'db-master': stop file exists for all stanzas P00 DEBUG: Protocol::Command::Master->close=>: iExitStatus = 0 P00 DEBUG: Common::Exit::exitSafe(): iExitCode = [undef], oException = [object], strSignal = [undef] @@ -652,7 +652,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 62 stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --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]/db-master/lock @@ -666,7 +666,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --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]/db-master/lock @@ -681,7 +681,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - stanza stop (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -724,9 +724,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 ERROR: [062]: raised from remote process on 'db-master': stop file exists for stanza db P00 DEBUG: Protocol::Command::Master->close=>: iExitStatus = 0 P00 DEBUG: Common::Exit::exitSafe(): iExitCode = [undef], oException = [object], strSignal = [undef] @@ -739,7 +739,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 62 start db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --stanza=db +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 0, oException = [undef], strSignal = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy=>: iExitStatus = 0 @@ -750,7 +750,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 start all stanzas (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 0, oException = [undef], strSignal = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy=>: iExitStatus = 0 @@ -761,7 +761,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 start all stanzas (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] P00 WARN: stop file does not exist P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 0, oException = [undef], strSignal = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef] @@ -773,7 +773,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stop all stanzas (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --force stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-path=[TEST_PATH]/backup/repo +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/backup/pgbackrest.conf --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo1-path=[TEST_PATH]/backup/repo 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 @@ -788,7 +788,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - abort backup - remote (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --type=full --stanza=db backup --test --test-delay=5 --test-point=backup-start=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=5 --test-point=backup-start=y --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=5 --test-point=backup-start=y --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -831,9 +831,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 DEBUG: Db::dbObjectGet=>: iDbMasterIdx = 1, iDbStandbyIdx = [undef], oDbMaster = [object], oDbStandby = [undef] P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: found cached protocol @@ -895,7 +895,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 63 full backup - global stop (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -915,7 +915,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 62 start all stanzas (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start 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 --repo-path=[TEST_PATH]/backup/repo +P00 INFO: start 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 --repo1-path=[TEST_PATH]/backup/repo P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 0, oException = [undef], strSignal = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef] P00 DEBUG: Protocol::Helper::protocolDestroy=>: iExitStatus = 0 @@ -926,7 +926,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - resume (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --force --checksum-page --type=full --stanza=db backup --test --test-delay=0.2 --test-point=backup-resume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -967,9 +967,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 DEBUG: Db::dbObjectGet=>: iDbMasterIdx = 1, iDbStandbyIdx = [undef], oDbMaster = [object], oDbStandby = [undef] P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: found cached protocol @@ -1049,8 +1049,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, 184473f470864e067ee3a22e64b47b0a1c356f29, 0, [BACKUP-FULL-2], 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-2], 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] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --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 --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --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 --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --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 @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 @@ -1155,13 +1155,9 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -1172,16 +1168,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -1194,7 +1194,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -1300,18 +1300,18 @@ db-version="9.4" 1={"db-catalog-version":201409291,"db-control-version":942,"db-system-id":1000000000000000094,"db-version":"9.4"} full backup - invalid repo (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --repo-path=/bogus_path --log-level-console=detail --type=full --stanza=db backup +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --repo1-path=/bogus_path --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=/bogus_path --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=/bogus_path --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. -P00 ERROR: [073]: repo-path '/bogus_path' does not exist +P00 ERROR: [073]: repo1-path '/bogus_path' does not exist P00 INFO: backup command end: aborted with exception [073] restore delta, backup '[BACKUP-FULL-2]' - add and delete files (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-2] --link-all --cmd-ssh=/usr/bin/ssh --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --set=[BACKUP-FULL-2] --stanza=db P00 DEBUG: Common::Lock::lockAcquire(): bFailOnNoLock = , bRemote = , strLockType = restore P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -1323,9 +1323,9 @@ P00 DEBUG: Storage::Local->pathCreate(): bCreateParent = true, bIgnoreExist P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = <1>, strBackRestBin = [undef], strCommand = , strRemoteType = backup P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = restore, strRemoteType = backup -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = /usr/bin/ssh, strHost = backup, strUser = [USER-2] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = /usr/bin/ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no backrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = /usr/bin/ssh, strHost = backup, strUser = [USER-2] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = /usr/bin/ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no pgbackrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = P00 DEBUG: Storage::Local->new(): bAllowTemp = , hRule = [undef], lBufferMax = 4194304, oDriver = [object], strCipherPassUser = [undef], strCipherType = [undef], strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strPathBase = [TEST_PATH]/db-master/db/base, strTempExtension = pgbackrest.tmp P00 DEBUG: Storage::Local->pathExists(): strPathExp = [TEST_PATH]/db-master/db/base @@ -1455,8 +1455,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, 3, [MODIFICATION-TIME-1], 184473f470864e067ee3a22e64b47b0a1c356f29, 0, 0, pg_data/base/1/PG_VERSION, [undef], 0660, [USER-1], [GROUP-1], [MODIFICATION-TIME-3], 1, [BACKUP-FULL-2], 0), rParamSecure = [undef], strKey = pg_data/base/1/PG_VERSION, strOp = restoreFile, strQueue = pg_data P00 DEBUG: Protocol::Local::Process->queueJob(): iHostConfigIdx = 1, rParam = ([TEST_PATH]/db-master/db/base/PG_VERSION, 3, [MODIFICATION-TIME-1], 184473f470864e067ee3a22e64b47b0a1c356f29, 0, 0, pg_data/PG_VERSION, [undef], 0600, [USER-1], [GROUP-1], [MODIFICATION-TIME-3], 1, [BACKUP-FULL-2], 0), rParamSecure = [undef], strKey = pg_data/PG_VERSION, strOp = restoreFile, strQueue = pg_data P00 DEBUG: Protocol::Local::Process->hostConnect: start local process: iHostConfigIdx = 1, iHostIdx = 0, iHostProcessIdx = 0, iProcessId = 1, strHostType = backup -P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --cmd-ssh=/usr/bin/ssh --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --stanza=db --type=backup local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --cmd-ssh=/usr/bin/ssh --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --process=1 --protocol-timeout=60 --stanza=db --type=backup local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --cmd-ssh=/usr/bin/ssh --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db --type=backup local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --cmd-ssh=/usr/bin/ssh --command=restore --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --host-id=1 --lock-path=[TEST_PATH]/db-master/lock --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process=1 --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db --type=backup 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 @@ -1539,7 +1539,7 @@ restore_command = '[BACKREST-BIN] --cmd-ssh=/usr/bin/ssh --config=[TEST_PATH]/db restore delta, backup '[BACKUP-FULL-2]' - fix broken symlink (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-FULL-2] --link-all --log-level-console=detail --compress-level-network=0 --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=0 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=0 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --link-all --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 DETAIL: check [TEST_PATH]/db-master/db/base exists P00 DETAIL: check [TEST_PATH]/db-master/db/pg_stat exists @@ -1575,9 +1575,9 @@ restore, backup '[BACKUP-FULL-2]', expect exit 72 - restore errors on backup hos P00 ERROR: [072]: restore command must be run on the db host restore, backup '[BACKUP-FULL-2]' - on backup host (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --set=[BACKUP-FULL-2] --log-level-console=detail --no-db1-host --db-path=[TEST_PATH]/backup/db --stanza=db restore +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --set=[BACKUP-FULL-2] --log-level-console=detail --no-pg1-host --pg1-path=[TEST_PATH]/backup/db --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --no-db1-host --db1-path=[TEST_PATH]/backup/db --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --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 --no-pg1-host --pg1-path=[TEST_PATH]/backup/db --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 INFO: remap $PGDATA directory to [TEST_PATH]/backup/db P00 WARN: contents of directory link pg_stat will be restored in a directory at the same location @@ -1613,7 +1613,7 @@ P00 ERROR: [072]: backup and expire commands must be run on the backup host restore delta, force, backup '[BACKUP-FULL-2]', expect exit 40 - fail on missing PG_VERSION (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --set=[BACKUP-FULL-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --set=[BACKUP-FULL-2] --stanza=db P00 WARN: --delta or --force specified but unable to find 'PG_VERSION' or 'backup.manifest' in '[TEST_PATH]/db-master/db/base' to confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist in the destination directories the restore will be aborted. P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: contents of directory link pg_stat will be restored in a directory at the same location @@ -1625,7 +1625,7 @@ P00 INFO: restore command end: aborted with exception [040] restore delta, force, backup '[BACKUP-FULL-2]' - restore succeeds with backup.manifest file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --set=[BACKUP-FULL-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --set=[BACKUP-FULL-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --set=[BACKUP-FULL-2] --stanza=db P00 INFO: restore backup set [BACKUP-FULL-2] P00 WARN: group bogus in manifest cannot be used for restore, set to [USER-1] P00 WARN: user bogus in manifest cannot be used for restore, set to [USER-1] @@ -1660,7 +1660,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf incr backup - invalid database version (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database version = 9.4, system-id 1000000000000000094 does not match backup version = 8.0, system-id = 1000000000000000094 @@ -1670,7 +1670,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid system id (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database version = 9.4, system-id 1000000000000000094 does not match backup version = 9.4, system-id = 6999999999999999999 @@ -1680,7 +1680,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid control version (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database control-version = 942, catalog-version 201409291 does not match backup control-version = 842, catalog-version = 201409291 @@ -1690,7 +1690,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid catalog version (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 ERROR: [051]: database control-version = 942, catalog-version 201409291 does not match backup control-version = 942, catalog-version = 197208141 @@ -1700,7 +1700,7 @@ P00 INFO: backup command end: aborted with exception [051] incr backup - invalid path in pg_tblspc (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1711,7 +1711,7 @@ P00 INFO: backup command end: aborted with exception [069] incr backup - invalid relative tablespace in $PGDATA (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1722,7 +1722,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - invalid tablespace in $PGDATA (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -1733,7 +1733,7 @@ P00 INFO: backup command end: aborted with exception [071] incr backup - add tablespace 1 (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --test --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -1772,9 +1772,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 DEBUG: Db::dbObjectGet=>: iDbMasterIdx = 1, iDbStandbyIdx = [undef], oDbMaster = [object], oDbStandby = [undef] P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: found cached protocol @@ -1846,8 +1846,8 @@ P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/16384/PG P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/1/PG_VERSION to [BACKUP-FULL-2] P00 DEBUG: Backup::Backup->processManifest: reference pg_data/PG_VERSION to [BACKUP-FULL-2] 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] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --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 --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --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 --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --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 = 1 P00 DEBUG: Protocol::Local::Process->init=>: bResult = true @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 @@ -1931,13 +1931,9 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -1948,16 +1944,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -1970,7 +1970,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -2084,7 +2084,7 @@ db-version="9.4" incr backup - resume and add tablespace 2 (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --process-max=1 --stanza=db backup --test --test-delay=0.2 --test-point=backup-resume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-resume=y P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 DEBUG: Storage::Posix::Driver->new(): bFileSync = , bPathSync = @@ -2131,9 +2131,9 @@ P00 DEBUG: Db->new(): iRemoteIdx = 1 P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = backup, strRemoteType = db -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strRemoteHost = db-master, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote, strCommandSSH = ssh, strHost = db-master, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no [USER-1]@db-master '[BACKREST-BIN] --buffer-size=4194304 --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db remote', strId = remote process on 'db-master', strName = remote P00 DEBUG: Db::dbObjectGet=>: iDbMasterIdx = 1, iDbStandbyIdx = [undef], oDbMaster = [object], oDbStandby = [undef] P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = , strRemoteType = db P00 DEBUG: Protocol::Helper::protocolGet: found cached protocol @@ -2224,8 +2224,8 @@ P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/16384/PG P00 DEBUG: Backup::Backup->processManifest: reference pg_data/base/1/PG_VERSION to [BACKUP-FULL-2] P00 DEBUG: Backup::Backup->processManifest: reference pg_data/PG_VERSION to [BACKUP-FULL-2] 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] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db local -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --host-id=1 --lock-path=[TEST_PATH]/backup/lock --log-path=[TEST_PATH]/backup/log --process=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --type=db local, strId = local-1 process, strName = local +P00 DEBUG: Protocol::Local::Master->new(): iProcessIdx = 1, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --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 --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --type=db local +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = [BACKREST-BIN] --command=backup --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --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 --process=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --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 = 2 P00 DEBUG: Protocol::Local::Process->init=>: bResult = true @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 @@ -2313,13 +2313,9 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -2330,16 +2326,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -2352,7 +2352,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -2476,7 +2476,7 @@ db-version="9.4" diff backup - cannot resume - new diff (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --type=diff --stanza=db backup --test --test-delay=0.2 --test-point=backup-noresume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: backup [BACKUP-INCR-2] missing manifest removed from backup.info @@ -2492,20 +2492,16 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -2516,16 +2512,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -2538,7 +2538,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -2658,7 +2658,7 @@ db-version="9.4" diff backup - cannot resume - disabled / no repo link (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --no-resume --log-level-console=detail --process-max=1 --type=diff --stanza=db backup --test --test-delay=0.2 --test-point=backup-noresume=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --no-resume --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --no-resume --stanza=db --start-fast --test --test-delay=0.2 --test-point=backup-noresume=y --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: backup [BACKUP-DIFF-1] missing manifest removed from backup.info @@ -2674,20 +2674,16 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -2698,16 +2694,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -2720,7 +2720,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -2840,7 +2840,7 @@ db-version="9.4" restore, backup '[BACKUP-DIFF-2]', expect exit 40 - fail on used path (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --set=[BACKUP-DIFF-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --set=[BACKUP-DIFF-2] --stanza=db +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --set=[BACKUP-DIFF-2] --stanza=db P00 INFO: restore backup set [BACKUP-DIFF-2] P00 DETAIL: check [TEST_PATH]/db-master/db/base exists P00 ERROR: [040]: cannot restore to path '[TEST_PATH]/db-master/db/base' that contains files - try using --delta if this is what you intended @@ -2849,7 +2849,7 @@ P00 INFO: restore command end: aborted with exception [040] restore, backup '[BACKUP-DIFF-2]', remap - remap all paths (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --set=[BACKUP-DIFF-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-2] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2 P00 INFO: remap tablespace pg_tblspc/1 directory to [TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -2883,7 +2883,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, backup '[BACKUP-DIFF-2]', remap - ensure file in tblspc root remains after --delta (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --set=[BACKUP-DIFF-2] --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --set=[BACKUP-DIFF-2] --stanza=db --tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-2] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2 P00 INFO: remap tablespace pg_tblspc/1 directory to [TEST_PATH]/db-master/db/tablespace/ts1-2 @@ -2921,7 +2921,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf incr backup - add files and remove tablespace 2 (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2 --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-DIFF-2], version = [VERSION-1] @@ -2933,24 +2933,20 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -2961,16 +2957,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=n @@ -2983,7 +2983,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -3100,7 +3100,7 @@ db-version="9.4" stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -3143,7 +3143,7 @@ db-version="9.4" incr backup - update files (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-INCR-3], version = [VERSION-1] @@ -3153,24 +3153,20 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -3181,16 +3177,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=n @@ -3203,7 +3203,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -3321,7 +3321,7 @@ db-version="9.4" diff backup - updates since last full (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2 --process-max=1 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -3338,24 +3338,20 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -3366,16 +3362,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=n @@ -3388,7 +3388,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -3507,7 +3507,7 @@ db-version="9.4" incr backup - remove files - but won't affect manifest (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2 --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-DIFF-3], version = [VERSION-1] @@ -3517,24 +3517,20 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -3545,16 +3541,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y @@ -3567,7 +3567,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -3687,7 +3687,7 @@ db-version="9.4" diff backup - remove files during backup (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --process-max=1 --type=diff --stanza=db backup --test --test-delay=1 --test-point=manifest-build=y ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --hardlink --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=1 --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2 --process-max=1 --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --test --test-delay=1 --test-point=manifest-build=y --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] @@ -3704,24 +3704,20 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -3732,30 +3728,34 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y compress-level=3 compress-level-network=1 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/backup/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -3874,7 +3874,7 @@ db-version="9.4" full backup - update file (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --hardlink --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2 --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=full P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base-2/base/32768/33001 (64KB, 44%) checksum 6bf316f11d28c28914ea9be92c00de9bea6d9a6b @@ -3895,24 +3895,20 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -3923,30 +3919,34 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y compress-level=3 compress-level-network=1 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/backup/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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] @@ -4423,7 +4423,7 @@ P00 INFO: expire command end: completed successfully diff backup - add file (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=detail --checksum-page --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --hardlink --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --checksum-page --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2 --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-3], version = [VERSION-1] @@ -4446,24 +4446,20 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -4474,30 +4470,34 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y compress-level=3 compress-level-network=1 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/backup/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -4613,7 +4613,7 @@ db-version="9.4" restore delta, remap - selective restore 16384 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --log-level-console=detail --db-include=16384 --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=16384=1 --db1-path=[TEST_PATH]/db-master/db/base-2 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=16384=1 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap tablespace pg_tblspc/2 directory to [TEST_PATH]/db-master/db/tablespace/ts2-2 P00 DETAIL: check [TEST_PATH]/db-master/db/base-2 exists @@ -4650,7 +4650,7 @@ restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf restore delta, remap - selective restore 32768 (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --delta --log-level-console=detail --db-include=32768 --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=32768=1 --db1-path=[TEST_PATH]/db-master/db/base-2 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-include=32768=1 --delta --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2 --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db --tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap tablespace pg_tblspc/2 directory to [TEST_PATH]/db-master/db/tablespace/ts2-2 P00 DETAIL: check [TEST_PATH]/db-master/db/base-2 exists @@ -4697,7 +4697,7 @@ P00 ERROR: [081]: system databases (template0, postgres, etc.) are included by restore, remap, expect exit 73 - no tablespace remap - error when tablespace dir does not exist (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=detail --tablespace-map-all=../../tablespace --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2/base --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db --tablespace-map-all=../../tablespace +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db --tablespace-map-all=../../tablespace P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2/base P00 INFO: remap tablespace pg_tblspc/2 directory to ../../tablespace/ts2 @@ -4709,7 +4709,7 @@ P00 INFO: restore command end: aborted with exception [073] restore - no tablespace remap (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --tablespace-map-all=../../tablespace --log-level-console=detail --stanza=db restore ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: restore command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base-2/base --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db --tablespace-map-all=../../tablespace +P00 INFO: restore command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base-2/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db --tablespace-map-all=../../tablespace P00 INFO: restore backup set [BACKUP-DIFF-5] P00 INFO: remap $PGDATA directory to [TEST_PATH]/db-master/db/base-2/base P00 INFO: remap tablespace pg_tblspc/2 directory to ../../tablespace/ts2 @@ -4890,7 +4890,7 @@ info bogus stanza - bogus stanza (db-master host) diff backup - config file not validated on remote (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=info --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2/base --db-timeout=45 --db1-user=[USER-1] --hardlink --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2/base --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-3], version = [VERSION-1] @@ -4898,22 +4898,18 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2/base +pg1-path=[TEST_PATH]/db-master/db/base-2/base [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -4924,31 +4920,35 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool bogus=bogus + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2/base -db-user=[USER-1] +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-2/base [global] compress=y compress-level=3 compress-level-network=1 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/backup/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -5065,7 +5065,7 @@ db-version="9.4" diff backup - option backup-standby reset - backup performed from master (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=info --backup-standby --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --backup-standby --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2/base --db-timeout=45 --db1-user=[USER-1] --hardlink --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --backup-standby --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2/base --protocol-timeout=60 --repo1-hardlink --repo1-path=[TEST_PATH]/backup/repo --stanza=db --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: option backup-standby is enabled but standby is not properly configured - backups will be performed from the master @@ -5074,22 +5074,18 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2/base +pg1-path=[TEST_PATH]/db-master/db/base-2/base [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -5100,30 +5096,34 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2/base -db-user=[USER-1] +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-2/base [global] compress=y compress-level=3 compress-level-network=1 db-timeout=45 -hardlink=y lock-path=[TEST_PATH]/backup/lock log-level-console=debug log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-hardlink=y +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y diff --git a/test/expect/mock-all-003.log b/test/expect/mock-all-003.log index d6c574812..d69aadae1 100644 --- a/test/expect/mock-all-003.log +++ b/test/expect/mock-all-003.log @@ -14,7 +14,7 @@ info all stanzas - no stanzas exist (db-master host) stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -70,7 +70,7 @@ P00 WARN: option retention-full is not set, the repository may run out of spac P00 ERROR: [070]: link '[TEST_PATH]/db-master/db/base/postgresql.conf.bad' -> '../pg_config/postgresql.conf.link' cannot reference another link full backup - create pg_stat link, pg_clog dir (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --manifest-save-threshold=3 --protocol-timeout=2 --db-timeout=1 --cmd-ssh=/usr/bin/ssh --db1-port=[PORT-1] --db1-socket-path =/test_socket_path --buffer-size=16384 --checksum-page --process-max=1 --type=full --stanza=db backup +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --manifest-save-threshold=3 --protocol-timeout=2 --db-timeout=1 --cmd-ssh=/usr/bin/ssh --pg1-port=9999 --pg1-socket-path =/test_socket_path --buffer-size=16384 --checksum-page --process-max=1 --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. @@ -80,13 +80,9 @@ P00 WARN: invalid page checksum found in file db-master:[TEST_PATH]/db-master/ + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -98,16 +94,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -121,16 +121,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -254,13 +254,9 @@ P00 TEST: PgBaCkReStTeSt-BACKUP-RESUME-PgBaCkReStTeSt + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -272,16 +268,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -295,16 +295,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -416,7 +416,7 @@ db-version="9.4" 1={"db-catalog-version":201409291,"db-control-version":942,"db-system-id":1000000000000000094,"db-version":"9.4"} full backup - invalid repo (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --repo-path=/bogus_path --log-level-console=warn --type=full --stanza=db backup +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --repo1-path=/bogus_path --log-level-console=warn --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. @@ -527,13 +527,9 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base/pg + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -545,16 +541,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -568,16 +568,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -709,13 +709,9 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base/pg + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -727,16 +723,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -750,16 +750,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -901,13 +901,9 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base/pg + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -919,16 +915,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -942,16 +942,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -1089,13 +1089,9 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base/pg + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -1107,16 +1103,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress=n @@ -1130,16 +1130,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -1295,17 +1295,13 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -1317,16 +1313,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=n @@ -1340,16 +1340,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -1472,7 +1472,7 @@ db-version="9.4" stanza-create db - create required data for stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2 --db-timeout=45 --db1-user=[USER-1] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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-2 --protocol-timeout=60 --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 ERROR: [055]: backup information missing and repo is encrypted and info file(s) are missing, --force cannot be used P00 INFO: stanza-create command end: aborted with exception [055] @@ -1505,17 +1505,13 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -1527,16 +1523,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=n @@ -1550,16 +1550,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -1694,17 +1694,13 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -1716,16 +1712,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=n @@ -1739,16 +1739,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -1882,17 +1882,13 @@ P00 TEST: PgBaCkReStTeSt-MANIFEST-BUILD-PgBaCkReStTeSt + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -1904,16 +1900,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y @@ -1927,16 +1927,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -2073,17 +2073,13 @@ P00 WARN: page misalignment in file db-master:[TEST_PATH]/db-master/db/base-2/ + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -2095,16 +2091,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y @@ -2118,16 +2118,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -2258,17 +2258,13 @@ P00 WARN: option retention-full is not set, the repository may run out of spac + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -2280,16 +2276,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y @@ -2303,16 +2303,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-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 --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] @@ -2800,17 +2800,13 @@ P00 WARN: option retention-full is not set, the repository may run out of spac + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2 +pg1-path=[TEST_PATH]/db-master/db/base-2 [db:restore] tablespace-map=1=[TEST_PATH]/db-master/db/tablespace/ts1-2 tablespace-map=2=[TEST_PATH]/db-master/db/tablespace/ts2-2 [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -2822,16 +2818,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2 -db-user=[USER-1] +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-2 [global] compress=y @@ -2845,16 +2845,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -3150,7 +3150,7 @@ info bogus stanza - bogus stanza (db-master host) diff backup - config file not validated on remote (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=info --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=2 --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2/base --process-max=2 --protocol-timeout=60 --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 --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 INFO: last backup label = [BACKUP-FULL-3], version = [VERSION-1] @@ -3158,22 +3158,18 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2/base +pg1-path=[TEST_PATH]/db-master/db/base-2/base [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -3185,17 +3181,21 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool bogus=bogus + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2/base -db-user=[USER-1] +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-2/base [global] compress=y @@ -3209,16 +3209,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -3341,7 +3341,7 @@ db-version="9.4" diff backup - option backup-standby reset - backup performed from master (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=info --backup-standby --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --backup-standby --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base-2/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --process-max=2 --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --backup-standby --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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-2/base --process-max=2 --protocol-timeout=60 --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 --start-fast --type=diff P00 WARN: option retention-full is not set, the repository may run out of space HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum. P00 WARN: option backup-standby is enabled but standby is not properly configured - backups will be performed from the master @@ -3350,22 +3350,18 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=info --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base-2/base +pg1-path=[TEST_PATH]/db-master/db/base-2/base [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress=n compress-level=3 compress-level-network=1 @@ -3377,16 +3373,20 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base-2/base -db-user=[USER-1] +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-2/base [global] compress=y @@ -3400,16 +3400,16 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y diff --git a/test/expect/mock-archive-001.log b/test/expect/mock-archive-001.log index 2b6baa063..d1c644c93 100644 --- a/test/expect/mock-archive-001.log +++ b/test/expect/mock-archive-001.log @@ -3,7 +3,7 @@ run 001 - rmt 0, s3 0, enc 1 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [055]: unable to open [TEST_PATH]/db-master/repo/archive/db/archive.info or [TEST_PATH]/db-master/repo/archive/db/archive.info.copy P00 ERROR: [055]: archive.info does not exist but is required to push/get WAL segments HINT: is archive_command configured in postgresql.conf? @@ -13,7 +13,7 @@ P00 INFO: archive-push command end: aborted with exception [055] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [055]: unable to open [TEST_PATH]/db-master/repo/archive/db/archive.info or [TEST_PATH]/db-master/repo/archive/db/archive.info.copy P00 ERROR: [055]: archive.info does not exist but is required to push/get WAL segments @@ -25,7 +25,7 @@ P00 INFO: archive-get command end: aborted with exception [055] stanza-create db - stanza create (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -68,7 +68,7 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push --log-level-console=debug [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -115,7 +115,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get --log-level-console=debug 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Archive::Get::Get->process(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000001 P00 INFO: get WAL segment 000000010000000100000001 P00 DEBUG: Archive::Get::Get->get(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000001 @@ -161,40 +161,40 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push --compress --archive-async --process-max=2 [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --archive-async --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --process-max=2 --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --spool-path=[TEST_PATH]/db-master/spool --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --archive-async --compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process-max=2 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --spool-path=[TEST_PATH]/db-master/spool --stanza=db P00 INFO: pushed WAL segment 000000010000000100000002 asynchronously P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [044]: WAL segment version 9.4 does not match archive version 8.0 HINT: are you archiving to the correct stanza? P00 INFO: archive-push command end: aborted with exception [044] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 INFO: archive-get command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [125]: unable to retrieve the archive id for database version '9.4' and system-id '1000000000000000094' P00 INFO: archive-get command end: aborted with exception [125] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [044]: WAL segment system-id 1000000000000000094 does not match archive system-id 5000900090001855000 HINT: are you archiving to the correct stanza? P00 INFO: archive-push command end: aborted with exception [044] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [125]: unable to retrieve the archive id for database version '9.4' and system-id '1000000000000000094' P00 INFO: archive-get command end: aborted with exception [125] @@ -202,18 +202,18 @@ P00 INFO: archive-get command end: aborted with exception [125] stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stop command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [062]: stop file exists for stanza db P00 INFO: archive-push command end: aborted with exception [062] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [062]: stop file exists for stanza db P00 INFO: archive-get command end: aborted with exception [062] @@ -221,12 +221,12 @@ P00 INFO: archive-get command end: aborted with exception [062] start db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: start command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 WARN: WAL segment 000000010000000100000002 already exists in the archive with the same checksum HINT: this is valid in some recovery scenarios but may also indicate a problem. P00 INFO: pushed WAL segment 000000010000000100000002 @@ -234,25 +234,25 @@ P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [045]: WAL segment 000000010000000100000002 already exists in the archive P00 INFO: archive-push command end: aborted with exception [045] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000002 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: get WAL segment 000000010000000100000002 P00 INFO: archive-get command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002.partial ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: pushed WAL segment 000000010000000100000002.partial P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002.partial ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 WARN: WAL segment 000000010000000100000002.partial already exists in the archive with the same checksum HINT: this is valid in some recovery scenarios but may also indicate a problem. P00 INFO: pushed WAL segment 000000010000000100000002.partial @@ -260,6 +260,6 @@ P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002.partial ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [045]: WAL segment 000000010000000100000002.partial already exists in the archive P00 INFO: archive-push command end: aborted with exception [045] diff --git a/test/expect/mock-archive-002.log b/test/expect/mock-archive-002.log index db2a54525..c7b56d2d1 100644 --- a/test/expect/mock-archive-002.log +++ b/test/expect/mock-archive-002.log @@ -3,7 +3,7 @@ run 002 - rmt 1, s3 0, enc 0 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 ERROR: [055]: raised from remote process on 'backup': archive.info does not exist but is required to push/get WAL segments HINT: is archive_command configured in postgresql.conf? HINT: has a stanza-create been performed? @@ -12,7 +12,7 @@ P00 INFO: archive-push command end: aborted with exception [055] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [055]: raised from remote process on 'backup': archive.info does not exist but is required to push/get WAL segments HINT: is archive_command configured in postgresql.conf? @@ -23,7 +23,7 @@ P00 INFO: archive-get command end: aborted with exception [055] stanza-create db - stanza create (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-2] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --pg1-host=db-master --pg1-host-cmd=[BACKREST-BIN] --pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf --pg1-host-user=[USER-2] --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -60,7 +60,7 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push --cmd-ssh=/usr/bin/ssh --log-level-console=debug [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -68,9 +68,9 @@ P00 DEBUG: Archive::Push::File::archivePushFile(): bCompress = false, iComp P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = <1>, strBackRestBin = [undef], strCommand = , strRemoteType = backup P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = archive-push, strRemoteType = backup -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = /usr/bin/ssh, strHost = backup, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = /usr/bin/ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no backrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = /usr/bin/ssh, strHost = backup, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = /usr/bin/ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no pgbackrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote P00 DEBUG: Protocol::Storage::Remote->new(): oProtocol = [object] P00 DEBUG: Archive::Common::walInfo(): strWalFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 P00 DEBUG: Archive::Common::walInfo=>: strDbVersion = 9.4, ullDbSysId = 1000000000000000094 @@ -99,7 +99,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get --log-level-console=debug 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 DEBUG: Archive::Get::Get->process(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000001 P00 INFO: get WAL segment 000000010000000100000001 P00 DEBUG: Archive::Get::Get->get(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000001 @@ -108,9 +108,9 @@ P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = <1>, strBackRestBin = [undef], strCommand = , strRemoteType = backup P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = archive-get, strRemoteType = backup -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-1] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no backrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-1] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-1] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no pgbackrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote P00 DEBUG: Protocol::Storage::Remote->new(): oProtocol = [object] P00 DEBUG: Archive::Base->getCheck(): bCheck = false, strDbVersion = [undef], strFile = 000000010000000100000001, ullDbSysId = [undef] P00 DEBUG: Db::dbObjectGet(): bMasterOnly = true @@ -138,40 +138,40 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push --compress --archive-async --process-max=2 [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --archive-async --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --process-max=2 --protocol-timeout=60 --spool-path=[TEST_PATH]/db-master/spool --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --archive-async --compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --process-max=2 --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --spool-path=[TEST_PATH]/db-master/spool --stanza=db P00 INFO: pushed WAL segment 000000010000000100000002 asynchronously P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 ERROR: [044]: raised from remote process on 'backup': WAL segment version 9.4 does not match archive version 8.0 HINT: are you archiving to the correct stanza? P00 INFO: archive-push command end: aborted with exception [044] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 INFO: archive-get command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [125]: raised from remote process on 'backup': unable to retrieve the archive id for database version '9.4' and system-id '1000000000000000094' P00 INFO: archive-get command end: aborted with exception [125] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 ERROR: [044]: raised from remote process on 'backup': WAL segment system-id 1000000000000000094 does not match archive system-id 5000900090001855000 HINT: are you archiving to the correct stanza? P00 INFO: archive-push command end: aborted with exception [044] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [125]: raised from remote process on 'backup': unable to retrieve the archive id for database version '9.4' and system-id '1000000000000000094' P00 INFO: archive-get command end: aborted with exception [125] @@ -179,18 +179,18 @@ P00 INFO: archive-get command end: aborted with exception [125] stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: stop command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 ERROR: [062]: stop file exists for stanza db P00 INFO: archive-push command end: aborted with exception [062] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000001 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: get WAL segment 000000010000000100000001 P00 ERROR: [062]: stop file exists for stanza db P00 INFO: archive-get command end: aborted with exception [062] @@ -198,12 +198,12 @@ P00 INFO: archive-get command end: aborted with exception [062] start db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db start ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: start command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --stanza=db +P00 INFO: start command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: start command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 WARN: WAL segment 000000010000000100000002 already exists in the archive with the same checksum HINT: this is valid in some recovery scenarios but may also indicate a problem. P00 INFO: pushed WAL segment 000000010000000100000002 @@ -211,25 +211,25 @@ P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 ERROR: [045]: WAL segment 000000010000000100000002 already exists in the archive P00 INFO: archive-push command end: aborted with exception [045] > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get --cmd-ssh=/usr/bin/ssh 000000010000000100000002 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --cmd-ssh=/usr/bin/ssh --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: get WAL segment 000000010000000100000002 P00 INFO: archive-get command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002.partial ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 INFO: pushed WAL segment 000000010000000100000002.partial P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002.partial ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 WARN: WAL segment 000000010000000100000002.partial already exists in the archive with the same checksum HINT: this is valid in some recovery scenarios but may also indicate a problem. P00 INFO: pushed WAL segment 000000010000000100000002.partial @@ -237,6 +237,6 @@ P00 INFO: archive-push command end: completed successfully > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002.partial ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-1] --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --no-compress --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-1] --stanza=db P00 ERROR: [045]: WAL segment 000000010000000100000002.partial already exists in the archive P00 INFO: archive-push command end: aborted with exception [045] diff --git a/test/expect/mock-archive-003.log b/test/expect/mock-archive-003.log index 0a9d2f1af..5ff6fb3d3 100644 --- a/test/expect/mock-archive-003.log +++ b/test/expect/mock-archive-003.log @@ -18,7 +18,7 @@ P00 ERROR: [055]: raised from remote process on 'backup': archive.info does not stanza-create db - stanza create (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info diff --git a/test/expect/mock-stanza-001.log b/test/expect/mock-stanza-001.log index 9d3887f4c..e2d052c42 100644 --- a/test/expect/mock-stanza-001.log +++ b/test/expect/mock-stanza-001.log @@ -4,14 +4,14 @@ run 001 - remote 0, s3 0, enc 0 stanza-create db - fail on missing control file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [041]: unable to open [TEST_PATH]/db-master/db/base/global/pg_control P00 INFO: stanza-create command end: aborted with exception [041] stanza-upgrade db - fail on stanza not initialized since archive.info is missing (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [055]: archive.info does not exist but is required to push/get WAL segments HINT: is archive_command configured in postgresql.conf? HINT: has a stanza-create been performed? @@ -22,7 +22,7 @@ P00 INFO: stanza-upgrade command end: aborted with exception [055] stanza-create db - successfully create the stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -60,7 +60,7 @@ db-version="9.3" stanza-create db - do not fail on rerun of stanza-create - info files exist and DB section ok (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create was already performed P00 INFO: stanza-create command end: completed successfully @@ -99,7 +99,7 @@ db-version="9.3" stanza-create db - fail on database mismatch without force option (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [028]: backup info file or archive info file invalid HINT: use stanza-upgrade if the database has been upgraded or use --force P00 INFO: stanza-create command end: aborted with exception [028] @@ -139,7 +139,7 @@ db-version="9.3" stanza-upgrade db - already up to date (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: the stanza data is already up to date P00 INFO: stanza-upgrade command end: completed successfully @@ -177,7 +177,7 @@ db-version="9.3" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -225,7 +225,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-create db - fail on archive info file missing from non-empty dir (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [055]: archive information missing HINT: use stanza-create --force to force the stanza data to be recreated. P00 INFO: stanza-create command end: aborted with exception [055] @@ -250,7 +250,7 @@ db-version="9.3" stanza-create db - gunzip fail on forced stanza-create (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [041]: unable to open '[TEST_PATH]/db-master/repo/archive/db/9.3-1/0000000100000001/000000010000000100000001-488ba4b8b98acc510bce86b8f16e3c1ed9886a29.gz': Permission denied P00 INFO: stanza-create command end: aborted with exception [041] @@ -274,7 +274,7 @@ db-version="9.3" stanza-create db - force create archive.info from gz file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -312,7 +312,7 @@ db-version="9.3" stanza-create db - force create archive.info from uncompressed file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -350,7 +350,7 @@ db-version="9.3" stanza-create db - force with missing WAL archive file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -388,7 +388,7 @@ db-version="9.3" stanza-create db - force with missing WAL archive directory (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 WARN: found empty directory [TEST_PATH]/db-master/repo/archive/db/9.3-1 P00 INFO: stanza-create command end: completed successfully @@ -426,7 +426,7 @@ db-version="9.3" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -480,7 +480,7 @@ P00 ERROR: [044]: WAL segment version 9.4 does not match archive version 9.3 stanza-upgrade db - successful upgrade creates additional history (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-upgrade command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -519,7 +519,7 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000002 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 DEBUG: Archive::Get::Get->process(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000002 P00 INFO: get WAL segment 000000010000000100000002 P00 DEBUG: Archive::Get::Get->get(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000002 @@ -569,7 +569,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-create db - use force to recreate the stanza producing mismatched info history but same current db-id (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -609,7 +609,7 @@ db-version="9.4" stanza-create db - use force to recreate the stanza producing mismatched db-id (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -648,7 +648,7 @@ db-version="9.4" full backup - create first full backup (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --retention-full=2 --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --retention-full=2 --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --retention-full=2 --stanza=db --start-fast --type=full P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG (16MB, 33%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 (16MB, 66%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 (16MB, 99%) checksum e40de8cea99dd469c3efb47f5f33a73c7390fb9c @@ -658,7 +658,7 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/archive_status/000 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=2 --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=2 --retention-full=2 --stanza=db P00 INFO: remove archive path: [TEST_PATH]/db-master/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 @@ -666,7 +666,7 @@ P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress-level=3 @@ -677,7 +677,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -687,7 +687,7 @@ start-fast=y stanza-create db - fail no force to recreate the stanza from backups (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [055]: backup information missing HINT: use stanza-create --force to force the stanza data to be recreated. P00 INFO: stanza-create command end: aborted with exception [055] @@ -711,7 +711,7 @@ db-version="9.4" stanza-create db - use force to recreate the stanza from backups (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -753,7 +753,7 @@ db-version="9.4" stanza-upgrade db - successfully upgrade with XX.Y-Z (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-upgrade command end: completed successfully + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info @@ -801,7 +801,7 @@ db-version="9.5" diff backup - diff changed to full backup (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --retention-full=2 --no-online --log-level-console=detail --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --retention-full=2 --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --retention-full=2 --stanza=db --start-fast --type=diff P00 WARN: no prior backup exists, diff backup has been changed to full P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG (16MB, 33%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 (16MB, 66%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 @@ -812,14 +812,14 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/archive_status/000 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --retention-archive=2 --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/repo --retention-archive=2 --retention-full=2 --stanza=db P00 INFO: remove archive path: [TEST_PATH]/db-master/repo/archive/db/10.0-3 P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress-level=3 @@ -830,7 +830,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -943,7 +943,7 @@ info all stanzas - db upgraded - db-1 and db-2 listed (db-master host) stanza-delete db - fail on missing stop file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-delete ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 ERROR: [055]: stop file does not exist for stanza 'db' HINT: has the pgbackrest stop command been run on this server? P00 INFO: stanza-delete command end: aborted with exception [055] @@ -961,7 +961,7 @@ db stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo1-path=[TEST_PATH]/db-master/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]/db-master/lock @@ -975,7 +975,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-delete db - successfully delete the stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-delete ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db +P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-path=[TEST_PATH]/db-master/repo --stanza=db P00 INFO: stanza-delete command end: completed successfully db must not exist for successful delete diff --git a/test/expect/mock-stanza-002.log b/test/expect/mock-stanza-002.log index 498ea997e..dcf4738df 100644 --- a/test/expect/mock-stanza-002.log +++ b/test/expect/mock-stanza-002.log @@ -4,14 +4,14 @@ run 002 - remote 1, s3 0, enc 1 stanza-create db - fail on missing control file (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [041]: raised from remote process on 'db-master': unable to open [TEST_PATH]/db-master/db/base/global/pg_control P00 INFO: stanza-create command end: aborted with exception [041] stanza-upgrade db - fail on stanza not initialized since archive.info is missing (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [055]: archive.info does not exist but is required to push/get WAL segments HINT: is archive_command configured in postgresql.conf? HINT: has a stanza-create been performed? @@ -22,7 +22,7 @@ P00 INFO: stanza-upgrade command end: aborted with exception [055] stanza-create db - successfully create the stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -66,7 +66,7 @@ db-version="9.3" stanza-create db - do not fail on rerun of stanza-create - info files exist and DB section ok (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-create was already performed P00 INFO: stanza-create command end: completed successfully @@ -111,7 +111,7 @@ db-version="9.3" stanza-create db - fail on database mismatch without force option (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [028]: backup info file or archive info file invalid HINT: use stanza-upgrade if the database has been upgraded or use --force P00 INFO: stanza-create command end: aborted with exception [028] @@ -157,7 +157,7 @@ db-version="9.3" stanza-upgrade db - already up to date (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: the stanza data is already up to date P00 INFO: stanza-upgrade command end: completed successfully @@ -201,7 +201,7 @@ db-version="9.3" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db P00 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -209,9 +209,9 @@ P00 DEBUG: Archive::Push::File::archivePushFile(): bCompress = true, iCompr P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = <1>, strBackRestBin = [undef], strCommand = , strRemoteType = backup P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = archive-push, strRemoteType = backup -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-2] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no backrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-2] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no pgbackrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote P00 DEBUG: Protocol::Storage::Remote->new(): oProtocol = [object] P00 DEBUG: Archive::Common::walInfo(): strWalFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 P00 DEBUG: Archive::Common::walInfo=>: strDbVersion = 9.3, ullDbSysId = 1000000000000000093 @@ -241,7 +241,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-create db - gunzip fail on forced stanza-create (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [041]: unable to open '[TEST_PATH]/backup/repo/archive/db/9.3-1/0000000100000001/000000010000000100000001-488ba4b8b98acc510bce86b8f16e3c1ed9886a29.gz': Permission denied P00 INFO: stanza-create command end: aborted with exception [041] @@ -268,7 +268,7 @@ db-version="9.3" stanza-create db - force create archive.info from gz file (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [055]: archive information missing and repo is encrypted and info file(s) are missing, --force cannot be used P00 INFO: stanza-create command end: aborted with exception [055] @@ -294,7 +294,7 @@ db-version="9.3" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db P00 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -302,9 +302,9 @@ P00 DEBUG: Archive::Push::File::archivePushFile(): bCompress = true, iCompr P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = <1>, strBackRestBin = [undef], strCommand = , strRemoteType = backup P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = archive-push, strRemoteType = backup -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-2] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no backrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-2] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no pgbackrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-push --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote P00 DEBUG: Protocol::Storage::Remote->new(): oProtocol = [object] P00 DEBUG: Archive::Common::walInfo(): strWalFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 P00 DEBUG: Archive::Common::walInfo=>: strDbVersion = 9.3, ullDbSysId = 1000000000000000093 @@ -340,7 +340,7 @@ P00 ERROR: [044]: raised from remote process on 'backup': WAL segment version 9 stanza-upgrade db - successful upgrade creates additional history (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-upgrade command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -385,7 +385,7 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000002 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --backup-cmd=[BACKREST-BIN] --backup-config=[TEST_PATH]/backup/pgbackrest.conf --backup-host=backup --backup-user=[USER-2] --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --repo1-host=backup --repo1-host-cmd=[BACKREST-BIN] --repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf --repo1-host-user=[USER-2] --stanza=db P00 DEBUG: Archive::Get::Get->process(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000002 P00 INFO: get WAL segment 000000010000000100000002 P00 DEBUG: Archive::Get::Get->get(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000002 @@ -394,9 +394,9 @@ P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false P00 DEBUG: Protocol::Helper::protocolGet(): bCache = , iProcessIdx = [undef], iRemoteIdx = <1>, strBackRestBin = [undef], strCommand = , strRemoteType = backup P00 DEBUG: Protocol::Helper::protocolGet: create (cached) remote protocol P00 DEBUG: Protocol::Helper::protocolParam(): iProcessIdx = [undef], iRemoteIdx = 1, strBackRestBin = [undef], strCommand = archive-get, strRemoteType = backup -P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] -P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-2] -P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no backrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote +P00 DEBUG: Protocol::Helper::protocolParam=>: strRemoteCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strRemoteHost = backup, strRemoteHostSshPort = [undef], strRemoteHostUser = [USER-2] +P00 DEBUG: Protocol::Remote::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, iSshPort = [undef], strCommand = [BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote, strCommandSSH = ssh, strHost = backup, strUser = [USER-2] +P00 DEBUG: Protocol::Command::Master->new(): iBufferMax = 4194304, iCompressLevel = 3, iCompressLevelNetwork = 1, iProtocolTimeout = 60, strCommand = ssh -o LogLevel=error -o Compression=no -o PasswordAuthentication=no pgbackrest@backup '[BACKREST-BIN] --buffer-size=4194304 --command=archive-get --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --stanza=db --type=backup remote', strId = remote process on 'backup', strName = remote P00 DEBUG: Protocol::Storage::Remote->new(): oProtocol = [object] P00 DEBUG: Archive::Base->getCheck(): bCheck = false, strDbVersion = [undef], strFile = 000000010000000100000002, ullDbSysId = [undef] P00 DEBUG: Db::dbObjectGet(): bMasterOnly = true @@ -428,7 +428,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 full backup - create first full backup (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --retention-full=2 --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --retention-full=2 --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --retention-full=2 --stanza=db --start-fast --type=full P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG (16MB, 33%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 (16MB, 66%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 (16MB, 99%) checksum e40de8cea99dd469c3efb47f5f33a73c7390fb9c @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-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 --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 @@ -446,13 +446,9 @@ P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress-level=3 compress-level-network=1 db-timeout=45 @@ -462,16 +458,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress-level=3 @@ -483,9 +483,9 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=[TEST_PATH]/backup/repo +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -494,7 +494,7 @@ start-fast=y stanza-create db - fail no force to recreate the stanza from backups (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [055]: backup information missing and repo is encrypted and info file(s) are missing, --force cannot be used P00 INFO: stanza-create command end: aborted with exception [055] @@ -520,7 +520,7 @@ db-version="9.4" stanza-create db - use force to recreate the stanza from backups (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [055]: backup information missing and repo is encrypted and info file(s) are missing, --force cannot be used P00 INFO: stanza-create command end: aborted with exception [055] @@ -546,7 +546,7 @@ db-version="9.4" stanza-upgrade db - successfully upgrade with XX.Y-Z (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-upgrade command end: completed successfully + supplemental file: [TEST_PATH]/backup/repo/backup/db/backup.info @@ -601,7 +601,7 @@ db-version="9.5" diff backup - diff changed to full backup (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --retention-full=2 --no-online --log-level-console=detail --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --retention-full=2 --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --no-online --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --retention-full=2 --stanza=db --start-fast --type=diff P00 WARN: no prior backup exists, diff backup has been changed to full P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG (16MB, 33%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file db-master:[TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 (16MB, 66%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 @@ -612,20 +612,16 @@ 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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-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 --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 + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-2] compress-level=3 compress-level-network=1 db-timeout=45 @@ -635,16 +631,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-2] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-user=[USER-1] +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 [global] compress-level=3 @@ -656,9 +656,9 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=[TEST_PATH]/backup/repo +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -775,7 +775,7 @@ info all stanzas - db upgraded - db-1 and db-2 listed (db-master host) stanza-delete db - fail on missing stop file (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-delete ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 ERROR: [055]: stop file does not exist for stanza 'db' HINT: has the pgbackrest stop command been run on this server? P00 INFO: stanza-delete command end: aborted with exception [055] @@ -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 --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --lock-path=[TEST_PATH]/backup/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/backup/log --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-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 --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 @@ -807,7 +807,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-delete db - successfully delete the stanza (backup host) > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail stanza-delete ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db1-cmd=[BACKREST-BIN] --db1-config=[TEST_PATH]/db-master/pgbackrest.conf --db1-host=db-master --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --db1-user=[USER-1] --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backup/log --protocol-timeout=60 --repo-cipher-pass= --repo-cipher-type=aes-256-cbc --repo-path=[TEST_PATH]/backup/repo --stanza=db +P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --compress-level-network=1 --config=[TEST_PATH]/backup/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/backup/lock --log-level-console=detail --log-level-file=trace --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 --protocol-timeout=60 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=[TEST_PATH]/backup/repo --stanza=db P00 INFO: stanza-delete command end: completed successfully db must not exist for successful delete diff --git a/test/expect/mock-stanza-003.log b/test/expect/mock-stanza-003.log index afdc6d116..34efa8f5a 100644 --- a/test/expect/mock-stanza-003.log +++ b/test/expect/mock-stanza-003.log @@ -4,14 +4,14 @@ run 003 - remote 0, s3 1, enc 0 stanza-create db - fail on missing control file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 ERROR: [041]: unable to open [TEST_PATH]/db-master/db/base/global/pg_control P00 INFO: stanza-create command end: aborted with exception [041] stanza-upgrade db - fail on stanza not initialized since archive.info is missing (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 ERROR: [055]: archive.info does not exist but is required to push/get WAL segments HINT: is archive_command configured in postgresql.conf? HINT: has a stanza-create been performed? @@ -22,7 +22,7 @@ P00 INFO: stanza-upgrade command end: aborted with exception [055] stanza-create db - successfully create the stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -60,7 +60,7 @@ db-version="9.3" stanza-create db - do not fail on rerun of stanza-create - info files exist and DB section ok (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create was already performed P00 INFO: stanza-create command end: completed successfully @@ -99,7 +99,7 @@ db-version="9.3" stanza-create db - fail on database mismatch without force option (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 ERROR: [028]: backup info file or archive info file invalid HINT: use stanza-upgrade if the database has been upgraded or use --force P00 INFO: stanza-create command end: aborted with exception [028] @@ -139,7 +139,7 @@ db-version="9.3" stanza-upgrade db - already up to date (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: the stanza data is already up to date P00 INFO: stanza-upgrade command end: completed successfully @@ -177,7 +177,7 @@ db-version="9.3" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -225,7 +225,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-create db - fail on archive info file missing from non-empty dir (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 ERROR: [055]: archive information missing HINT: use stanza-create --force to force the stanza data to be recreated. P00 INFO: stanza-create command end: aborted with exception [055] @@ -250,7 +250,7 @@ db-version="9.3" stanza-create db - force create archive.info from gz file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -288,7 +288,7 @@ db-version="9.3" stanza-create db - force create archive.info from uncompressed file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -326,7 +326,7 @@ db-version="9.3" stanza-create db - force with missing WAL archive file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -364,7 +364,7 @@ db-version="9.3" stanza-create db - force with missing WAL archive directory (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -401,7 +401,7 @@ db-version="9.3" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-push [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: archive-push command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 DEBUG: Archive::Push::Push->process(): strWalPathFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 P00 DEBUG: Common::Lock::lockStopTest(): bStanzaStopRequired = P00 DEBUG: Common::Lock::lockStopTest=>: bStopExists = false @@ -455,7 +455,7 @@ P00 ERROR: [044]: WAL segment version 9.4 does not match archive version 9.3 stanza-upgrade db - successful upgrade creates additional history (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-upgrade command end: completed successfully + supplemental file: /backup/db/backup.info @@ -494,7 +494,7 @@ db-version="9.4" > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get 000000010000000100000002 [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: archive-get command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: archive-get command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 DEBUG: Archive::Get::Get->process(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000002 P00 INFO: get WAL segment 000000010000000100000002 P00 DEBUG: Archive::Get::Get->get(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG, strSourceArchive = 000000010000000100000002 @@ -544,7 +544,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-create db - use force to recreate the stanza producing mismatched info history but same current db-id (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -584,7 +584,7 @@ db-version="9.4" stanza-create db - use force to recreate the stanza producing mismatched db-id (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -623,7 +623,7 @@ db-version="9.4" full backup - create first full backup (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --retention-full=2 --no-online --log-level-console=detail --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --retention-full=2 --stanza=db --start-fast --type=full +P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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=2 --stanza=db --start-fast --type=full P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG (16MB, 33%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 (16MB, 66%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001 (16MB, 99%) checksum e40de8cea99dd469c3efb47f5f33a73c7390fb9c @@ -633,7 +633,7 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/archive_status/000 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --retention-archive=2 --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --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-archive=2 --retention-full=2 --stanza=db P00 INFO: remove archive path: /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 @@ -641,7 +641,7 @@ P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress-level=3 @@ -652,14 +652,14 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -669,7 +669,7 @@ start-fast=y stanza-create db - fail no force to recreate the stanza from backups (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 ERROR: [055]: backup information missing HINT: use stanza-create --force to force the stanza data to be recreated. P00 INFO: stanza-create command end: aborted with exception [055] @@ -693,7 +693,7 @@ db-version="9.4" stanza-create db - use force to recreate the stanza from backups (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-create command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --force --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-create command end: completed successfully + supplemental file: /backup/db/backup.info @@ -735,7 +735,7 @@ db-version="9.4" stanza-upgrade db - successfully upgrade with XX.Y-Z (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --no-online stanza-upgrade ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-upgrade command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-upgrade command end: completed successfully + supplemental file: /backup/db/backup.info @@ -783,7 +783,7 @@ db-version="9.5" diff backup - diff changed to full backup (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --retention-full=2 --no-online --log-level-console=detail --type=diff --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --retention-full=2 --stanza=db --start-fast --type=diff +P00 INFO: backup command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --no-online --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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=2 --stanza=db --start-fast --type=diff P00 WARN: no prior backup exists, diff backup has been changed to full P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/RECOVERYXLOG (16MB, 33%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000002 (16MB, 66%) checksum 488ba4b8b98acc510bce86b8f16e3c1ed9886a29 @@ -794,14 +794,14 @@ P01 INFO: backup file [TEST_PATH]/db-master/db/base/pg_xlog/archive_status/000 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]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --retention-archive=2 --retention-full=2 --stanza=db +P00 INFO: expire command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --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-archive=2 --retention-full=2 --stanza=db P00 INFO: remove archive path: /archive/db/10.0-3 P00 INFO: expire command end: completed successfully + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base +pg1-path=[TEST_PATH]/db-master/db/base [global] compress-level=3 @@ -812,14 +812,14 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -932,7 +932,7 @@ info all stanzas - db upgraded - db-1 and db-2 listed (db-master host) stanza-delete db - fail on missing stop file (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-delete ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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 ERROR: [055]: stop file does not exist for stanza 'db' HINT: has the pgbackrest stop command been run on this server? P00 INFO: stanza-delete command end: aborted with exception [055] @@ -948,7 +948,7 @@ db must not exist for successful delete stop db stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stop ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stop command begin [BACKREST-VERSION]: --config=[TEST_PATH]/db-master/pgbackrest.conf --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --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 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]/db-master/lock @@ -962,7 +962,7 @@ P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 0 stanza-delete db - successfully delete the stanza (db-master host) > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail stanza-delete ------------------------------------------------------------------------------------------------------------------------------------ -P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db1-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=/ --repo-s3-bucket=pgbackrest-dev --repo-s3-endpoint=s3.amazonaws.com --repo-s3-key= --repo-s3-key-secret= --repo-s3-region=us-east-1 --no-repo-s3-verify-ssl --repo-type=s3 --stanza=db +P00 INFO: stanza-delete command begin [BACKREST-VERSION]: --compress-level=3 --config=[TEST_PATH]/db-master/pgbackrest.conf --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/db-master/log --pg1-path=[TEST_PATH]/db-master/db/base --protocol-timeout=60 --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: stanza-delete command end: completed successfully db must not exist for successful delete diff --git a/test/expect/real-all-001.log b/test/expect/real-all-001.log index 11623d433..c83b0361a 100644 --- a/test/expect/real-all-001.log +++ b/test/expect/real-all-001.log @@ -66,11 +66,11 @@ stanza-create db - verify success with force (db-master host) ------------------------------------------------------------------------------------------------------------------------------------ stanza-create db - fail on database mismatch with directory (db-master host) -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --db-path=[TEST_PATH]/db-master/db/testbase/ stanza-create +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --pg1-path=[TEST_PATH]/db-master/db/testbase/ stanza-create ------------------------------------------------------------------------------------------------------------------------------------ stanza-create db - successfully create stanza files to be upgraded (db-master host) -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --db-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --log-level-console=detail --pg1-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ stanza-upgrade db - upgrade stanza files online (db-master host) @@ -88,9 +88,9 @@ full backup - update during backup (db-master host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] compress=n @@ -102,7 +102,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -132,9 +132,9 @@ incr backup - update during backup (db-master host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] archive-async=y @@ -147,7 +147,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -248,9 +248,9 @@ incr backup - succeed on --no-online with --force (db-master host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db recovery-option=standby-mode=on [global] @@ -264,7 +264,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] diff --git a/test/expect/real-all-002.log b/test/expect/real-all-002.log index 8002b50d9..1be209e9c 100644 --- a/test/expect/real-all-002.log +++ b/test/expect/real-all-002.log @@ -12,19 +12,19 @@ full backup - update during backup (db-master host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-standby/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-standby/db/base -db2-user=[USER-1] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-standby/pgbackrest.conf -db8-host=db-standby -db8-path=[TEST_PATH]/db-standby/db/base -db8-user=[USER-1] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg2-host-user=[USER-1] +pg2-path=[TEST_PATH]/db-standby/db/base +pg8-host=db-standby +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg8-host-user=[USER-1] +pg8-path=[TEST_PATH]/db-standby/db/base [global] compress=n @@ -36,7 +36,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -46,15 +46,11 @@ start-fast=y + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/db-master/pgbackrest.conf -backup-host=db-master -backup-user=[USER-1] compress=n compress-level=3 db-timeout=45 @@ -64,6 +60,10 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 +repo1-host=db-master +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-standby/spool restore, type 'default', remap - restore backup on replica (db-standby host) @@ -77,7 +77,7 @@ standby_mode = 'on' restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"' full backup - backup from standby, failure to access at least one standby (db-master host) -> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --db8-host=bogus --backup-standby --type=full --stanza=db backup +> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --pg8-host=bogus --backup-standby --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ full backup - backup from standby (db-master host) @@ -87,19 +87,19 @@ full backup - backup from standby (db-master host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-standby/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-standby/db/base -db2-user=[USER-1] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-standby/pgbackrest.conf -db8-host=db-standby -db8-path=[TEST_PATH]/db-standby/db/base -db8-user=[USER-1] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg2-host-user=[USER-1] +pg2-path=[TEST_PATH]/db-standby/db/base +pg8-host=db-standby +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg8-host-user=[USER-1] +pg8-path=[TEST_PATH]/db-standby/db/base [global] archive-async=y @@ -112,7 +112,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -122,17 +122,13 @@ start-fast=y + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/db-master/pgbackrest.conf -backup-host=db-master -backup-user=[USER-1] compress=n compress-level=3 db-timeout=45 @@ -142,6 +138,10 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 +repo1-host=db-master +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-standby/spool check db - confirm standby manifest->build executed (db-standby host) @@ -159,19 +159,19 @@ incr backup - update during backup (db-master host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-standby/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-standby/db/base -db2-user=[USER-1] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-standby/pgbackrest.conf -db8-host=db-standby -db8-path=[TEST_PATH]/db-standby/db/base -db8-user=[USER-1] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg2-host-user=[USER-1] +pg2-path=[TEST_PATH]/db-standby/db/base +pg8-host=db-standby +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg8-host-user=[USER-1] +pg8-path=[TEST_PATH]/db-standby/db/base [global] archive-async=y @@ -184,7 +184,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-master/repo +repo1-path=[TEST_PATH]/db-master/repo spool-path=[TEST_PATH]/db-master/spool [global:backup] @@ -194,17 +194,13 @@ start-fast=y + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/db-master/pgbackrest.conf -backup-host=db-master -backup-user=[USER-1] compress=n compress-level=3 db-timeout=45 @@ -214,6 +210,10 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 +repo1-host=db-master +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-standby/spool restore, type 'default' (db-master host) diff --git a/test/expect/real-all-003.log b/test/expect/real-all-003.log index bbc7a2aa2..5922bbe6d 100644 --- a/test/expect/real-all-003.log +++ b/test/expect/real-all-003.log @@ -12,15 +12,11 @@ full backup - update during backup (db-standby host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/db-standby/pgbackrest.conf -backup-host=db-standby -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -31,24 +27,28 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=db-standby +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-master/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-master/db/base -db2-user=[USER-1] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-master/pgbackrest.conf -db8-host=db-master -db8-path=[TEST_PATH]/db-master/db/base -db8-user=[USER-1] +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg2-host-user=[USER-1] +pg2-path=[TEST_PATH]/db-master/db/base +pg8-host=db-master +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg8-host-user=[USER-1] +pg8-path=[TEST_PATH]/db-master/db/base [global] compress=n @@ -61,7 +61,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-standby/repo +repo1-path=[TEST_PATH]/db-standby/repo spool-path=[TEST_PATH]/db-standby/spool [global:backup] @@ -79,7 +79,7 @@ standby_mode = 'on' restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"' full backup - backup from standby, failure to reach master (db-standby host) -> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --db8-host=bogus --backup-standby --type=full --stanza=db backup +> [CONTAINER-EXEC] db-standby [BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --pg8-host=bogus --backup-standby --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ full backup - backup from standby (db-standby host) @@ -89,15 +89,11 @@ full backup - backup from standby (db-standby host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/db-standby/pgbackrest.conf -backup-host=db-standby -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -108,24 +104,28 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=db-standby +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-master/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-master/db/base -db2-user=[USER-1] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-master/pgbackrest.conf -db8-host=db-master -db8-path=[TEST_PATH]/db-master/db/base -db8-user=[USER-1] +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg2-host-user=[USER-1] +pg2-path=[TEST_PATH]/db-master/db/base +pg8-host=db-master +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg8-host-user=[USER-1] +pg8-path=[TEST_PATH]/db-master/db/base [db:restore] @@ -141,7 +141,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-standby/repo +repo1-path=[TEST_PATH]/db-standby/repo spool-path=[TEST_PATH]/db-standby/spool [global:backup] @@ -159,15 +159,11 @@ incr backup - update during backup (db-standby host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/db-standby/pgbackrest.conf -backup-host=db-standby -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -178,24 +174,28 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=db-standby +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-master/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-master/db/base -db2-user=[USER-1] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-master/pgbackrest.conf -db8-host=db-master -db8-path=[TEST_PATH]/db-master/db/base -db8-user=[USER-1] +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg2-host-user=[USER-1] +pg2-path=[TEST_PATH]/db-master/db/base +pg8-host=db-master +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg8-host-user=[USER-1] +pg8-path=[TEST_PATH]/db-master/db/base [db:restore] @@ -211,7 +211,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 -repo-path=[TEST_PATH]/db-standby/repo +repo1-path=[TEST_PATH]/db-standby/repo spool-path=[TEST_PATH]/db-standby/spool [global:backup] diff --git a/test/expect/real-all-004.log b/test/expect/real-all-004.log index 4b1fd5530..0df7328f4 100644 --- a/test/expect/real-all-004.log +++ b/test/expect/real-all-004.log @@ -90,7 +90,7 @@ stanza-create db - fail on backup info file missing from non-empty dir (backup h ------------------------------------------------------------------------------------------------------------------------------------ stanza-create db - successfully create stanza files to be upgraded (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --db-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --pg1-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ stanza-upgrade db - upgrade stanza files online (backup host) @@ -104,15 +104,11 @@ full backup - update during backup (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress-level=3 compress-level-network=1 db-timeout=45 @@ -122,17 +118,21 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 [global] compress-level=3 @@ -144,9 +144,9 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=[TEST_PATH]/backup/repo +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -171,15 +171,11 @@ incr backup - update during backup (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress-level=3 compress-level-network=1 db-timeout=45 @@ -189,17 +185,21 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 [global] archive-async=y @@ -212,9 +212,9 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=[TEST_PATH]/backup/repo +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -248,15 +248,11 @@ incr backup - succeed on --no-online with --force (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress-level=3 compress-level-network=1 db-timeout=45 @@ -266,17 +262,21 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 [global] archive-async=y @@ -289,9 +289,9 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-cipher-pass=x -repo-cipher-type=aes-256-cbc -repo-path=[TEST_PATH]/backup/repo +repo1-cipher-pass=x +repo1-cipher-type=aes-256-cbc +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y diff --git a/test/expect/real-all-005.log b/test/expect/real-all-005.log index d488e3c3e..666453991 100644 --- a/test/expect/real-all-005.log +++ b/test/expect/real-all-005.log @@ -12,15 +12,11 @@ full backup - update during backup (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -31,20 +27,20 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -55,28 +51,32 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-standby/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db1-cmd=[BACKREST-BIN] -db1-config=[TEST_PATH]/db-master/pgbackrest.conf -db1-host=db-master -db1-path=[TEST_PATH]/db-master/db/base -db1-port=[PORT-1] -db1-user=[USER-2] -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-standby/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-standby/db/base -db2-user=[USER-2] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-standby/pgbackrest.conf -db8-host=db-standby -db8-path=[TEST_PATH]/db-standby/db/base -db8-port=[PORT-2] -db8-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg2-host-user=[USER-2] +pg2-path=[TEST_PATH]/db-standby/db/base +pg8-host=db-standby +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg8-host-user=[USER-2] +pg8-path=[TEST_PATH]/db-standby/db/base +pg8-port=6544 [global] compress=n @@ -89,7 +89,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -106,7 +106,7 @@ standby_mode = 'on' restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-standby/pgbackrest.conf --stanza=db archive-get %f "%p"' full backup - backup from standby, failure to access at least one standby (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --db8-host=bogus --backup-standby --type=full --stanza=db backup +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --pg8-host=bogus --backup-standby --type=full --stanza=db backup ------------------------------------------------------------------------------------------------------------------------------------ full backup - backup from standby (backup host) @@ -116,15 +116,11 @@ full backup - backup from standby (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -135,22 +131,22 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -161,28 +157,32 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-standby/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db1-cmd=[BACKREST-BIN] -db1-config=[TEST_PATH]/db-master/pgbackrest.conf -db1-host=db-master -db1-path=[TEST_PATH]/db-master/db/base -db1-port=[PORT-1] -db1-user=[USER-2] -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-standby/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-standby/db/base -db2-user=[USER-2] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-standby/pgbackrest.conf -db8-host=db-standby -db8-path=[TEST_PATH]/db-standby/db/base -db8-port=[PORT-2] -db8-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg2-host-user=[USER-2] +pg2-path=[TEST_PATH]/db-standby/db/base +pg8-host=db-standby +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg8-host-user=[USER-2] +pg8-path=[TEST_PATH]/db-standby/db/base +pg8-port=6544 [global] archive-async=y @@ -196,7 +196,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y @@ -217,15 +217,11 @@ incr backup - update during backup (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -236,22 +232,22 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-master/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/db-standby/pgbackrest.conf ----------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-standby/db/base -db-port=[PORT-2] -db-socket-path=[TEST_PATH]/db-standby/db +pg1-path=[TEST_PATH]/db-standby/db/base +pg1-port=6544 +pg1-socket-path=[TEST_PATH]/db-standby/db [db:restore] [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress=n compress-level=3 compress-level-network=1 @@ -262,28 +258,32 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/db-standby/log protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-standby/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db1-cmd=[BACKREST-BIN] -db1-config=[TEST_PATH]/db-master/pgbackrest.conf -db1-host=db-master -db1-path=[TEST_PATH]/db-master/db/base -db1-port=[PORT-1] -db1-user=[USER-2] -db2-cmd=[BACKREST-BIN] -db2-config=[TEST_PATH]/db-standby/pgbackrest.conf -db2-host=bogus -db2-path=[TEST_PATH]/db-standby/db/base -db2-user=[USER-2] -db8-cmd=[BACKREST-BIN] -db8-config=[TEST_PATH]/db-standby/pgbackrest.conf -db8-host=db-standby -db8-path=[TEST_PATH]/db-standby/db/base -db8-port=[PORT-2] -db8-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg2-host=bogus +pg2-host-cmd=[BACKREST-BIN] +pg2-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg2-host-user=[USER-2] +pg2-path=[TEST_PATH]/db-standby/db/base +pg8-host=db-standby +pg8-host-cmd=[BACKREST-BIN] +pg8-host-config=[TEST_PATH]/db-standby/pgbackrest.conf +pg8-host-user=[USER-2] +pg8-path=[TEST_PATH]/db-standby/db/base +pg8-port=6544 [global] archive-async=y @@ -297,7 +297,7 @@ log-level-file=trace log-level-stderr=off log-path=[TEST_PATH]/backup/log protocol-timeout=60 -repo-path=[TEST_PATH]/backup/repo +repo1-path=[TEST_PATH]/backup/repo [global:backup] archive-copy=y diff --git a/test/expect/real-all-006.log b/test/expect/real-all-006.log index 1cbc520ee..4d007ee25 100644 --- a/test/expect/real-all-006.log +++ b/test/expect/real-all-006.log @@ -90,11 +90,11 @@ stanza-create db - verify success with force (backup host) ------------------------------------------------------------------------------------------------------------------------------------ stanza-create db - fail on database mismatch with directory (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --db-path=[TEST_PATH]/db-master/db/testbase/ stanza-create +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --pg1-path=[TEST_PATH]/db-master/db/testbase/ stanza-create ------------------------------------------------------------------------------------------------------------------------------------ stanza-create db - successfully create stanza files to be upgraded (backup host) -> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --db-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create +> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --log-level-console=detail --pg1-path=[TEST_PATH]/db-master/db/testbase/ --no-online --force stanza-create ------------------------------------------------------------------------------------------------------------------------------------ stanza-upgrade db - upgrade stanza files online (backup host) @@ -108,15 +108,11 @@ full backup - update during backup (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress-level=3 compress-level-network=1 db-timeout=45 @@ -127,17 +123,21 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 [global] compress-level=3 @@ -150,14 +150,14 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y @@ -170,15 +170,11 @@ incr backup - update during backup (backup host) + supplemental file: [TEST_PATH]/db-master/pgbackrest.conf ---------------------------------------------------------- [db] -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-socket-path=[TEST_PATH]/db-master/db +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 +pg1-socket-path=[TEST_PATH]/db-master/db [global] -backup-cmd=[BACKREST-BIN] -backup-config=[TEST_PATH]/backup/pgbackrest.conf -backup-host=backup -backup-user=[USER-1] compress-level=3 compress-level-network=1 db-timeout=45 @@ -189,17 +185,21 @@ log-level-stderr=off log-path=[TEST_PATH]/db-master/log process-max=2 protocol-timeout=60 +repo1-host=backup +repo1-host-cmd=[BACKREST-BIN] +repo1-host-config=[TEST_PATH]/backup/pgbackrest.conf +repo1-host-user=[USER-1] spool-path=[TEST_PATH]/db-master/spool + supplemental file: [TEST_PATH]/backup/pgbackrest.conf ------------------------------------------------------- [db] -db-cmd=[BACKREST-BIN] -db-config=[TEST_PATH]/db-master/pgbackrest.conf -db-host=db-master -db-path=[TEST_PATH]/db-master/db/base -db-port=[PORT-1] -db-user=[USER-2] +pg1-host=db-master +pg1-host-cmd=[BACKREST-BIN] +pg1-host-config=[TEST_PATH]/db-master/pgbackrest.conf +pg1-host-user=[USER-2] +pg1-path=[TEST_PATH]/db-master/db/base +pg1-port=6543 [global] archive-async=y @@ -213,14 +213,14 @@ log-level-stderr=off log-path=[TEST_PATH]/backup/log process-max=2 protocol-timeout=60 -repo-path=/ -repo-s3-bucket=pgbackrest-dev -repo-s3-endpoint=s3.amazonaws.com -repo-s3-key=accessKey1 -repo-s3-key-secret=verySecretKey1 -repo-s3-region=us-east-1 -repo-s3-verify-ssl=n -repo-type=s3 +repo1-path=/ +repo1-s3-bucket=pgbackrest-dev +repo1-s3-endpoint=s3.amazonaws.com +repo1-s3-key=accessKey1 +repo1-s3-key-secret=verySecretKey1 +repo1-s3-region=us-east-1 +repo1-s3-verify-ssl=n +repo1-type=s3 [global:backup] archive-copy=y diff --git a/test/expect/real-help-001.log b/test/expect/real-help-001.log index 2b2469ba7..19ad45f36 100644 --- a/test/expect/real-help-001.log +++ b/test/expect/real-help-001.log @@ -38,7 +38,7 @@ Get version. Displays installed pgBackRest version. -> [BACKREST-BIN] help --output=json --stanza=main --backup-host=backup info +> [BACKREST-BIN] help --output=json --stanza=main --repo1-host=backup info ------------------------------------------------------------------------------------------------------------------------------------ [BACKREST-NAME-VERSION] - 'info' command help @@ -82,17 +82,17 @@ Log Options: Repository Options: - --backup-cmd pgBackRest exe path on the backup host -[default=[BACKREST-BIN]] - --backup-config pgBackRest backup host configuration file -[default=/etc/pgbackrest.conf] - --backup-host backup host when operating remotely via SSH -[current=backup] - --backup-ssh-port backup server SSH port when backup-host is set - --backup-user backup host user when backup-host is set -[default=backrest] --repo-cipher-pass repository cipher passphrase --repo-cipher-type cipher used to encrypt the repository [default=none] + --repo-host repository host when operating remotely via SSH +[current=backup] + --repo-host-cmd pgBackRest exe path on the repository host +[default=[BACKREST-BIN]] + --repo-host-config pgBackRest repository host configuration file +[default=/etc/pgbackrest.conf] + --repo-host-port repository host port when repo-host is set + --repo-host-user repository host user when repo-host is set +[default=pgbackrest] --repo-path path where backups and archive are stored [default=/var/lib/pgbackrest] --repo-s3-bucket s3 repository bucket @@ -179,15 +179,15 @@ Log Options: Repository Options: - --backup-cmd pgBackRest exe path on the backup host - --backup-config pgBackRest backup host configuration file -[default=/etc/pgbackrest.conf] - --backup-host backup host when operating remotely via SSH - --backup-ssh-port backup server SSH port when backup-host is set - --backup-user backup host user when backup-host is set -[default=backrest] --repo-cipher-pass repository cipher passphrase --repo-cipher-type cipher used to encrypt the repository [default=none] + --repo-host repository host when operating remotely via SSH + --repo-host-cmd pgBackRest exe path on the repository host + --repo-host-config pgBackRest repository host configuration file +[default=/etc/pgbackrest.conf] + --repo-host-port repository host port when repo-host is set + --repo-host-user repository host user when repo-host is set +[default=pgbackrest] --repo-path path where backups and archive are stored [default=/var/lib/pgbackrest] --repo-s3-bucket s3 repository bucket @@ -204,15 +204,15 @@ Repository Options: Stanza Options: - --db-cmd pgBackRest exe path on the database host - --db-config pgBackRest database host configuration file + --pg-host postgreSQL host for operating remotely via SSH + --pg-host-cmd pgBackRest exe path on the PostgreSQL host + --pg-host-config pgBackRest database host configuration file [default=/etc/pgbackrest.conf] - --db-host cluster host for operating remotely via SSH - --db-path cluster data directory - --db-port cluster port [default=5432] - --db-socket-path cluster unix socket path - --db-ssh-port database server SSH port when db-host is set - --db-user cluster host logon user when db-host is set + --pg-host-port postgreSQL host port when pg-host is set + --pg-host-user postgreSQL host logon user when pg-host is set [default=postgres] + --pg-path postgreSQL data directory + --pg-port postgreSQL port [default=5432] + --pg-socket-path postgreSQL unix socket path Use 'pgbackrest help check [option]' for more information. diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm index ab11e7c00..59f5e17d2 100755 --- a/test/lib/pgBackRestTest/Common/ContainerTest.pm +++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm @@ -41,7 +41,7 @@ use constant TEST_USER => getpwuid( push @EXPORT, qw(TEST_USER); use constant TEST_USER_ID => $UID; -use constant BACKREST_USER => 'backrest'; +use constant BACKREST_USER => 'pgbackrest'; push @EXPORT, qw(BACKREST_USER); use constant BACKREST_USER_ID => getpwnam(BACKREST_USER) . ''; diff --git a/test/lib/pgBackRestTest/Common/DefineTest.pm b/test/lib/pgBackRestTest/Common/DefineTest.pm index 2463c738c..14d3b5b42 100644 --- a/test/lib/pgBackRestTest/Common/DefineTest.pm +++ b/test/lib/pgBackRestTest/Common/DefineTest.pm @@ -450,7 +450,7 @@ my $oTestDef = }, { &TESTDEF_NAME => 'parse', - &TESTDEF_TOTAL => 1, + &TESTDEF_TOTAL => 2, &TESTDEF_C => true, &TESTDEF_COVERAGE => diff --git a/test/lib/pgBackRestTest/Common/JobTest.pm b/test/lib/pgBackRestTest/Common/JobTest.pm index 995fda6b8..45f7b36d5 100644 --- a/test/lib/pgBackRestTest/Common/JobTest.pm +++ b/test/lib/pgBackRestTest/Common/JobTest.pm @@ -220,7 +220,7 @@ sub run " --module=" . $self->{oTest}->{&TEST_MODULE} . ' --test=' . $self->{oTest}->{&TEST_NAME} . $strCommandRunParam . - (defined($self->{oTest}->{&TEST_DB}) ? ' --db-version=' . $self->{oTest}->{&TEST_DB} : '') . + (defined($self->{oTest}->{&TEST_DB}) ? ' --pg-version=' . $self->{oTest}->{&TEST_DB} : '') . ($self->{strLogLevel} ne lc(INFO) ? " --log-level=$self->{strLogLevel}" : '') . ' --pgsql-bin=' . $self->{oTest}->{&TEST_PGSQL_BIN} . ($self->{bLogForce} ? ' --log-force' : '') . diff --git a/test/lib/pgBackRestTest/Common/LogTest.pm b/test/lib/pgBackRestTest/Common/LogTest.pm index ad1f5f6ca..214fd4b93 100644 --- a/test/lib/pgBackRestTest/Common/LogTest.pm +++ b/test/lib/pgBackRestTest/Common/LogTest.pm @@ -392,7 +392,7 @@ sub regExpReplaceAll $strLine = $self->regExpReplace($strLine, 'USER', 'strUser = [^ \n,\[\]]+', '[^ \n,\[\]]+$'); $strLine = $self->regExpReplace($strLine, 'USER', 'user"[ ]{0,1}:[ ]{0,1}"[^"]+', '[^"]+$'); $strLine = $self->regExpReplace($strLine, 'USER', 'user=\"[^"]+', '[^"]+$'); - $strLine = $self->regExpReplace($strLine, 'USER', '^db-user=.+$', '[^=]+$'); + $strLine = $self->regExpReplace($strLine, 'USER', '^pg-host-user=.+$', '[^=]+$'); $strLine = $self->regExpReplace($strLine, 'USER', 'user for .* was not mapped to a name\, set to .+$', '[^ ]+$'); $strLine = $self->regExpReplace($strLine, 'USER', 'set ownership [^\:]+', '[^ ]+$'); $strLine = $self->regExpReplace($strLine, 'USER', 'cannot be used for restore\, set to .+$', '[^ ]+$'); diff --git a/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm b/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm index 6f67e0218..2cfd3ed82 100644 --- a/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm +++ b/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm @@ -165,7 +165,7 @@ sub stanzaCreate my $strDbVersionTemp = $strDbVersion; $strDbVersionTemp =~ s/\.//; - my $strDbPath = cfgOption(CFGOPT_DB_PATH); + my $strDbPath = cfgOption(CFGOPT_PG_PATH); # Create the test path for pg_control storageTest()->pathCreate(($strDbPath . '/' . DB_PATH_GLOBAL), {bIgnoreExists => true}); @@ -206,11 +206,11 @@ sub stanzaUpgrade $strDbVersionTemp =~ s/\.//; # Remove pg_control - storageTest()->remove(cfgOption(CFGOPT_DB_PATH) . '/' . DB_FILE_PGCONTROL); + storageTest()->remove(cfgOption(CFGOPT_PG_PATH) . '/' . DB_FILE_PGCONTROL); # Copy pg_control for stanza-upgrade - $self->controlGenerate(cfgOption(CFGOPT_DB_PATH), $strDbVersion); - executeTest('sudo chmod 600 ' . cfgOption(CFGOPT_DB_PATH) . '/' . DB_FILE_PGCONTROL); + $self->controlGenerate(cfgOption(CFGOPT_PG_PATH), $strDbVersion); + executeTest('sudo chmod 600 ' . cfgOption(CFGOPT_PG_PATH) . '/' . DB_FILE_PGCONTROL); $self->stanzaSet($strStanza, $strDbVersion, true); diff --git a/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm b/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm index 3f95d9099..d8bc44f51 100644 --- a/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm +++ b/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm @@ -182,7 +182,7 @@ sub backupBegin (defined($oExpectedManifest) ? " --no-online" : '') . (defined($$oParam{strOptionalParam}) ? " $$oParam{strOptionalParam}" : '') . (defined($$oParam{bStandby}) && $$oParam{bStandby} ? " --backup-standby" : '') . - (defined($oParam->{strRepoType}) ? " --repo-type=$oParam->{strRepoType}" : '') . + (defined($oParam->{strRepoType}) ? " --repo1-type=$oParam->{strRepoType}" : '') . ($strType ne 'incr' ? " --type=${strType}" : '') . ' --stanza=' . (defined($oParam->{strStanza}) ? $oParam->{strStanza} : $self->stanza()) . ' backup' . (defined($strTest) ? " --test --test-delay=${fTestDelay} --test-point=" . lc($strTest) . '=y' : ''), @@ -983,37 +983,6 @@ sub stop return logDebugReturn($strOperation); } - -#################################################################################################################################### -# optionIndexName - return name for options that can be indexed (e.g. db1-host, db2-host) -# -# This differs from cfgOptionIndex because it allows the index number for index 1 to be ommitted for testing. -#################################################################################################################################### -sub optionIndexName -{ - my $self = shift; - my $iOptionId = shift; - my $iIndex = shift; - my $bForce = shift; - - # If the option doesn't have a prefix it can't be indexed - $iIndex = defined($iIndex) ? $iIndex : 1; - my $strPrefix = cfgDefOptionPrefix($iOptionId); - - if (!defined($strPrefix) && $iIndex > 1) - { - confess &log(ASSERT, "'" . cfgOptionName($iOptionId) . "' option does not allow indexing"); - } - - # Index 1 is the same name as the option unless forced to include the index - if ($iIndex == 1 && (!defined($bForce) || !$bForce)) - { - return $strPrefix . substr(cfgOptionName($iOptionId), index(cfgOptionName($iOptionId), '-')); - } - - return "${strPrefix}${iIndex}" . substr(cfgOptionName($iOptionId), index(cfgOptionName($iOptionId), '-')); -} - #################################################################################################################################### # configCreate #################################################################################################################################### @@ -1094,7 +1063,7 @@ sub configCreate if (defined($$oParam{bHardlink}) && $$oParam{bHardlink}) { $self->{bHardLink} = true; - $oParamHash{&CFGDEF_SECTION_GLOBAL . ':' . cfgCommandName(CFGCMD_BACKUP)}{cfgOptionName(CFGOPT_HARDLINK)} = 'y'; + $oParamHash{&CFGDEF_SECTION_GLOBAL . ':' . cfgCommandName(CFGCMD_BACKUP)}{cfgOptionName(CFGOPT_REPO_HARDLINK)} = 'y'; } $oParamHash{&CFGDEF_SECTION_GLOBAL . ':' . cfgCommandName(CFGCMD_BACKUP)}{cfgOptionName(CFGOPT_ARCHIVE_COPY)} = 'y'; @@ -1107,15 +1076,10 @@ sub configCreate # If this is the backup host if ($self->isHostBackup()) { - my $bForce = false; my $oHostDb1 = $oHostDbMaster; my $oHostDb2 = $oHostDbStandby; - if ($self->nameTest(HOST_BACKUP)) - { - $bForce = defined($oHostDbStandby); - } - elsif ($self->nameTest(HOST_DB_STANDBY)) + if ($self->nameTest(HOST_DB_STANDBY)) { $oHostDb1 = $oHostDbStandby; $oHostDb2 = $oHostDbMaster; @@ -1123,43 +1087,50 @@ sub configCreate if ($self->nameTest(HOST_BACKUP)) { - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_HOST, 1, $bForce)} = $oHostDb1->nameGet(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_USER, 1, $bForce)} = $oHostDb1->userGet(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_CMD, 1, $bForce)} = $oHostDb1->backrestExe(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_CONFIG, 1, $bForce)} = $oHostDb1->backrestConfig(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_HOST)} = $oHostDb1->nameGet(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_HOST_USER)} = $oHostDb1->userGet(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_HOST_CMD)} = $oHostDb1->backrestExe(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_HOST_CONFIG)} = $oHostDb1->backrestConfig(); # Port can't be configured for a synthetic host if (!$self->synthetic()) { - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_PORT, 1, $bForce)} = $oHostDb1->pgPort(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_PORT)} = $oHostDb1->pgPort(); } } - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_PATH, 1, $bForce)} = $oHostDb1->dbBasePath(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_PATH)} = $oHostDb1->dbBasePath(); if (defined($oHostDb2)) { # Add an invalid replica to simulate more than one replica. A warning should be thrown by dbObjectGet when a stanza is # created and a valid replica should be chosen. my $iInvalidReplica = 2; - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_HOST, $iInvalidReplica)} = BOGUS; - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_USER, $iInvalidReplica)} = $oHostDb2->userGet(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_CMD, $iInvalidReplica)} = $oHostDb2->backrestExe(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_CONFIG, $iInvalidReplica)} = $oHostDb2->backrestConfig(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_PATH, $iInvalidReplica)} = $oHostDb2->dbBasePath(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iInvalidReplica))} = BOGUS; + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST_USER, $iInvalidReplica))} = + $oHostDb2->userGet(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, $iInvalidReplica))} = + $oHostDb2->backrestExe(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CONFIG, $iInvalidReplica))} = + $oHostDb2->backrestConfig(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iInvalidReplica))} = + $oHostDb2->dbBasePath(); # Set a valid replica to the last possible index to ensure skipping indexes does not make a difference. - my $iValidReplica = cfgOptionIndexTotal(CFGOPT_DB_PATH); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_HOST, $iValidReplica)} = $oHostDb2->nameGet(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_USER, $iValidReplica)} = $oHostDb2->userGet(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_CMD, $iValidReplica)} = $oHostDb2->backrestExe(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_CONFIG, $iValidReplica)} = $oHostDb2->backrestConfig(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_PATH, $iValidReplica)} = $oHostDb2->dbBasePath(); + my $iValidReplica = cfgOptionIndexTotal(CFGOPT_PG_PATH); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iValidReplica))} = $oHostDb2->nameGet(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST_USER, $iValidReplica))} = + $oHostDb2->userGet(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, $iValidReplica))} = + $oHostDb2->backrestExe(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CONFIG, $iValidReplica))} = + $oHostDb2->backrestConfig(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_PATH, $iValidReplica))} = $oHostDb2->dbBasePath(); # Only test explicit ports on the backup server. This is so locally configured ports are also tested. if (!$self->synthetic() && $self->nameTest(HOST_BACKUP)) { - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_PORT, $iValidReplica)} = $oHostDb2->pgPort(); + $oParamHash{$strStanza}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_PORT, $iValidReplica))} = $oHostDb2->pgPort(); } } } @@ -1167,12 +1138,12 @@ sub configCreate # If this is a database host if ($self->isHostDb()) { - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_PATH)} = $self->dbBasePath(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_PATH)} = $self->dbBasePath(); if (!$self->synthetic()) { - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_SOCKET_PATH)} = $self->pgSocketPath(); - $oParamHash{$strStanza}{$self->optionIndexName(CFGOPT_DB_PORT)} = $self->pgPort(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_SOCKET_PATH)} = $self->pgSocketPath(); + $oParamHash{$strStanza}{cfgOptionName(CFGOPT_PG_PORT)} = $self->pgPort(); } if ($bArchiveAsync) @@ -1186,10 +1157,10 @@ sub configCreate # If the the backup host is remote if (!$self->isHostBackup()) { - $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_BACKUP_HOST)} = $oHostBackup->nameGet(); - $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_BACKUP_USER)} = $oHostBackup->userGet(); - $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_BACKUP_CMD)} = $oHostBackup->backrestExe(); - $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_BACKUP_CONFIG)} = $oHostBackup->backrestConfig(); + $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_REPO_HOST)} = $oHostBackup->nameGet(); + $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_REPO_HOST_USER)} = $oHostBackup->userGet(); + $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_REPO_HOST_CMD)} = $oHostBackup->backrestExe(); + $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_REPO_HOST_CONFIG)} = $oHostBackup->backrestConfig(); $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_LOG_PATH)} = $self->logPath(); $oParamHash{&CFGDEF_SECTION_GLOBAL}{cfgOptionName(CFGOPT_LOCK_PATH)} = $self->lockPath(); @@ -1526,14 +1497,13 @@ sub configRemap if ($strRemap eq MANIFEST_TARGET_PGDATA) { - $oConfig->{$strStanza}{$self->optionIndexName(CFGOPT_DB_PATH, 1)} = $strRemapPath; + $oConfig->{$strStanza}{cfgOptionName(CFGOPT_PG_PATH)} = $strRemapPath; ${$oManifestRef}{&MANIFEST_SECTION_BACKUP_TARGET}{&MANIFEST_TARGET_PGDATA}{&MANIFEST_SUBKEY_PATH} = $strRemapPath; if (defined($oHostBackup)) { - my $bForce = $oHostBackup->nameTest(HOST_BACKUP) && defined(hostGroupGet()->hostGet(HOST_DB_STANDBY, true)); - $oRemoteConfig->{$strStanza}{$self->optionIndexName(CFGOPT_DB_PATH, 1, $bForce)} = $strRemapPath; + $oRemoteConfig->{$strStanza}{cfgOptionName(CFGOPT_PG_PATH)} = $strRemapPath; } } else diff --git a/test/lib/pgBackRestTest/Env/Host/HostDbCommonTest.pm b/test/lib/pgBackRestTest/Env/Host/HostDbCommonTest.pm index c70c80d0b..ece4c7c7e 100644 --- a/test/lib/pgBackRestTest/Env/Host/HostDbCommonTest.pm +++ b/test/lib/pgBackRestTest/Env/Host/HostDbCommonTest.pm @@ -145,7 +145,7 @@ sub archivePush ' --config=' . $self->backrestConfig() . ' --log-level-console=warn --archive-queue-max=' . int(2 * PG_WAL_SIZE) . ' --stanza=' . $self->stanza() . - (defined($iExpectedError) && $iExpectedError == ERROR_FILE_READ ? ' --backup-host=bogus' : '') . + (defined($iExpectedError) && $iExpectedError == ERROR_FILE_READ ? ' --repo1-host=bogus' : '') . ($bAsync ? '' : ' --no-archive-async') . " archive-push" . (defined($strSourceFile) ? " ${strSourceFile}" : ''), {iExpectedExitStatus => $iExpectedError, oLogTest => $self->{oLogTest}, bLogOutput => $self->synthetic()}); diff --git a/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm b/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm index 7d33de954..f43c2d8fd 100644 --- a/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm +++ b/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm @@ -31,18 +31,9 @@ use pgBackRestTest::Env::Host::HostDbCommonTest; use pgBackRestTest::Common::ContainerTest; use pgBackRestTest::Common::RunTest; -#################################################################################################################################### -# Host parameters -#################################################################################################################################### -use constant HOST_PARAM_DB_LOG_FILE => 'db-log-file'; -use constant HOST_PARAM_DB_LOG_PATH => 'db-log-path'; -use constant HOST_PARAM_DB_PORT => 'db-port'; -use constant HOST_PARAM_DB_SOCKET_PATH => 'db-socket-path'; - #################################################################################################################################### # Db defaults #################################################################################################################################### -use constant HOST_DB_PORT => 6543; use constant HOST_DB_DEFAULT => 'postgres'; use constant HOST_DB_TIMEOUT => 30; diff --git a/test/lib/pgBackRestTest/Env/HostEnvTest.pm b/test/lib/pgBackRestTest/Env/HostEnvTest.pm index a3309e710..bb6bdf4c7 100644 --- a/test/lib/pgBackRestTest/Env/HostEnvTest.pm +++ b/test/lib/pgBackRestTest/Env/HostEnvTest.pm @@ -162,7 +162,7 @@ sub setup } # Set options needed for storage helper - $self->optionTestSet(CFGOPT_DB_PATH, $oHostDbMaster->dbBasePath()); + $self->optionTestSet(CFGOPT_PG_PATH, $oHostDbMaster->dbBasePath()); $self->optionTestSet(CFGOPT_REPO_PATH, $oHostBackup->repoPath()); $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchiveCommonTest.pm b/test/lib/pgBackRestTest/Module/Archive/ArchiveCommonTest.pm index bb87e09f5..2297d9c54 100644 --- a/test/lib/pgBackRestTest/Module/Archive/ArchiveCommonTest.pm +++ b/test/lib/pgBackRestTest/Module/Archive/ArchiveCommonTest.pm @@ -32,31 +32,31 @@ sub run ################################################################################################################################ if ($self->begin("${strModule}::walPath()")) { - my $strDbPath = '/db'; + my $strPgPath = '/db'; my $strWalFileRelative = 'pg_wal/000000010000000100000001'; - my $strWalFileAbsolute = "${strDbPath}/${strWalFileRelative}"; + my $strWalFileAbsolute = "${strPgPath}/${strWalFileRelative}"; #--------------------------------------------------------------------------------------------------------------------------- $self->testException( sub {walPath($strWalFileRelative, undef, cfgCommandName(CFGCMD_ARCHIVE_GET))}, ERROR_OPTION_REQUIRED, - "option 'db-path' must be specified when relative wal paths are used\n" . + "option 'pg1-path' must be specified when relative wal paths are used\n" . "HINT: Is \%f passed to " . cfgCommandName(CFGCMD_ARCHIVE_GET) . " instead of \%p?\n" . "HINT: PostgreSQL may pass relative paths even with \%p depending on the environment."); #--------------------------------------------------------------------------------------------------------------------------- $self->testResult( - sub {walPath($strWalFileRelative, $strDbPath, cfgCommandName(CFGCMD_ARCHIVE_PUSH))}, $strWalFileAbsolute, + sub {walPath($strWalFileRelative, $strPgPath, cfgCommandName(CFGCMD_ARCHIVE_PUSH))}, $strWalFileAbsolute, 'relative path is contructed'); #--------------------------------------------------------------------------------------------------------------------------- $self->testResult( - sub {walPath($strWalFileAbsolute, $strDbPath, cfgCommandName(CFGCMD_ARCHIVE_PUSH))}, $strWalFileAbsolute, - 'path is not relative and db-path is still specified'); + sub {walPath($strWalFileAbsolute, $strPgPath, cfgCommandName(CFGCMD_ARCHIVE_PUSH))}, $strWalFileAbsolute, + 'path is not relative and pg-path is still specified'); #--------------------------------------------------------------------------------------------------------------------------- $self->testResult( - sub {walPath($strWalFileAbsolute, $strDbPath, cfgCommandName(CFGCMD_ARCHIVE_PUSH))}, $strWalFileAbsolute, - 'path is not relative and db-path is undef'); + sub {walPath($strWalFileAbsolute, $strPgPath, cfgCommandName(CFGCMD_ARCHIVE_PUSH))}, $strWalFileAbsolute, + 'path is not relative and pg-path is undef'); } ################################################################################################################################ diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchiveGetTest.pm b/test/lib/pgBackRestTest/Module/Archive/ArchiveGetTest.pm index 674d092ce..cb2f15643 100644 --- a/test/lib/pgBackRestTest/Module/Archive/ArchiveGetTest.pm +++ b/test/lib/pgBackRestTest/Module/Archive/ArchiveGetTest.pm @@ -55,7 +55,7 @@ sub initTest $self->configTestClear(); $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); $self->optionTestSet(CFGOPT_REPO_PATH, $self->testPath() . '/repo'); - $self->optionTestSet(CFGOPT_DB_PATH, $self->{strDbPath}); + $self->optionTestSet(CFGOPT_PG_PATH, $self->{strDbPath}); $self->configTestLoad(CFGCMD_ARCHIVE_GET); # Create archive info path diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchivePushPerlTest.pm b/test/lib/pgBackRestTest/Module/Archive/ArchivePushPerlTest.pm index d9f5b6082..c3b95cf62 100644 --- a/test/lib/pgBackRestTest/Module/Archive/ArchivePushPerlTest.pm +++ b/test/lib/pgBackRestTest/Module/Archive/ArchivePushPerlTest.pm @@ -80,7 +80,7 @@ sub initOption my $self = shift; $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); - $self->optionTestSet(CFGOPT_DB_PATH, $self->{strDbPath}); + $self->optionTestSet(CFGOPT_PG_PATH, $self->{strDbPath}); $self->optionTestSet(CFGOPT_REPO_PATH, $self->{strRepoPath}); $self->optionTestSet(CFGOPT_LOG_PATH, $self->testPath()); $self->optionTestSetBool(CFGOPT_COMPRESS, false); @@ -184,8 +184,8 @@ sub run my $iWalMajor = 1; my $iWalMinor = 1; - $self->optionTestSet(CFGOPT_BACKUP_HOST, 'localhost'); - $self->optionTestSet(CFGOPT_BACKUP_USER, $self->pgUser()); + $self->optionTestSet(CFGOPT_REPO_HOST, 'localhost'); + $self->optionTestSet(CFGOPT_REPO_HOST_USER, $self->pgUser()); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); protocolGet(CFGOPTVAL_REMOTE_TYPE_BACKUP, undef, {strBackRestBin => $self->backrestExe()}); @@ -207,8 +207,8 @@ sub run # Destroy protocol object protocolDestroy(); - $self->optionTestClear(CFGOPT_BACKUP_HOST); - $self->optionTestClear(CFGOPT_BACKUP_USER); + $self->optionTestClear(CFGOPT_REPO_HOST); + $self->optionTestClear(CFGOPT_REPO_HOST_USER); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); } @@ -573,15 +573,15 @@ sub run my $iProcessId = $PID; #--------------------------------------------------------------------------------------------------------------------------- - # Set db-host to trick archive-push into thinking it is running on the backup server - $self->optionTestSet(CFGOPT_DB_HOST, BOGUS); + # Set pg-host to trick archive-push into thinking it is running on the backup server + $self->optionTestSet(CFGOPT_PG_HOST, BOGUS); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); $self->testException(sub {$oPush->process(undef)}, ERROR_HOST_INVALID, 'archive-push operation must run on db host'); #--------------------------------------------------------------------------------------------------------------------------- - # Reset db-host - $self->optionTestClear(CFGOPT_DB_HOST); + # Reset pg-host + $self->optionTestClear(CFGOPT_PG_HOST); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); $self->testException(sub {$oPush->process(undef)}, ERROR_PARAM_REQUIRED, 'WAL file to push required'); @@ -657,7 +657,7 @@ sub run $strSegment = $self->walSegment($iWalTimeline, $iWalMajor, $iWalMinor++); $self->walGenerate($self->{strWalPath}, PG_VERSION_94, 1, $strSegment); - $self->optionTestSet(CFGOPT_BACKUP_HOST, BOGUS); + $self->optionTestSet(CFGOPT_REPO_HOST, BOGUS); $self->optionTestSet(CFGOPT_PROTOCOL_TIMEOUT, 60); $self->optionTestSet(CFGOPT_ARCHIVE_TIMEOUT, 5); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); @@ -690,7 +690,7 @@ sub run $strErrorFileContents =~ ("42\nremote process on '" . BOGUS . "' terminated.*"), true, "check error file contents"); # Disable async archiving - $self->optionTestClear(CFGOPT_BACKUP_HOST); + $self->optionTestClear(CFGOPT_REPO_HOST); $self->optionTestClear(CFGOPT_PROTOCOL_TIMEOUT); $self->optionTestClear(CFGOPT_ARCHIVE_TIMEOUT); $self->optionTestClear(CFGOPT_ARCHIVE_ASYNC); diff --git a/test/lib/pgBackRestTest/Module/Expire/ExpireExpireTest.pm b/test/lib/pgBackRestTest/Module/Expire/ExpireExpireTest.pm index 136a93826..6995e01d7 100644 --- a/test/lib/pgBackRestTest/Module/Expire/ExpireExpireTest.pm +++ b/test/lib/pgBackRestTest/Module/Expire/ExpireExpireTest.pm @@ -43,7 +43,7 @@ sub initStanzaOption my $oHostS3 = shift; $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); - $self->optionTestSet(CFGOPT_DB_PATH, $strDbBasePath); + $self->optionTestSet(CFGOPT_PG_PATH, $strDbBasePath); $self->optionTestSet(CFGOPT_REPO_PATH, $strRepoPath); $self->optionTestSet(CFGOPT_LOG_PATH, $self->testPath()); @@ -236,7 +236,7 @@ sub run #----------------------------------------------------------------------------------------------------------------------- $self->optionTestClear(CFGOPT_DB_TIMEOUT); - $self->optionTestClear(CFGOPT_DB_PATH); + $self->optionTestClear(CFGOPT_PG_PATH); $self->optionTestClear(CFGOPT_ONLINE); $self->optionTestClear(CFGOPT_PROTOCOL_TIMEOUT); $self->optionTestSet(CFGOPT_RETENTION_FULL, 1); diff --git a/test/lib/pgBackRestTest/Module/Info/InfoUnitTest.pm b/test/lib/pgBackRestTest/Module/Info/InfoUnitTest.pm index 03f3dcfd5..453e1e67e 100644 --- a/test/lib/pgBackRestTest/Module/Info/InfoUnitTest.pm +++ b/test/lib/pgBackRestTest/Module/Info/InfoUnitTest.pm @@ -103,7 +103,7 @@ sub initStanzaCreate } $self->optionTestSet(CFGOPT_STANZA, $strStanza); - $self->optionTestSet(CFGOPT_DB_PATH, $self->{strDbPath}); + $self->optionTestSet(CFGOPT_PG_PATH, $self->{strDbPath}); $self->optionTestSet(CFGOPT_REPO_PATH, $self->{strRepoPath}); $self->optionTestSet(CFGOPT_LOG_PATH, $self->testPath()); $self->optionTestSetBool(CFGOPT_ONLINE, false); @@ -136,7 +136,7 @@ sub initStanzaUpgrade my $rhConfig = $self->configTestClear(); $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); - $self->optionTestSet(CFGOPT_DB_PATH, $self->{strDbPath}); + $self->optionTestSet(CFGOPT_PG_PATH, $self->{strDbPath}); $self->optionTestSet(CFGOPT_REPO_PATH, $self->{strRepoPath}); $self->optionTestSet(CFGOPT_LOG_PATH, $self->testPath()); $self->optionTestSetBool(CFGOPT_ONLINE, false); @@ -233,9 +233,9 @@ sub run # Test !isRepoLocal branch #--------------------------------------------------------------------------------------------------------------------------- - cfgOptionSet(CFGOPT_BACKUP_HOST, false); - cfgOptionSet(CFGOPT_BACKUP_CONFIG, BOGUS); - $self->testException(sub {$oInfo->stanzaList(BOGUS)}, ERROR_ASSERT, "option backup-cmd is required"); + cfgOptionSet(CFGOPT_REPO_HOST, false); + cfgOptionSet(CFGOPT_REPO_HOST_CONFIG, BOGUS); + $self->testException(sub {$oInfo->stanzaList(BOGUS)}, ERROR_ASSERT, "option repo1-host-cmd is required"); # dbArchiveSection() -- no archive #--------------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/pgBackRestTest/Module/Manifest/ManifestAllTest.pm b/test/lib/pgBackRestTest/Module/Manifest/ManifestAllTest.pm index f4c89afc3..53ccfaee9 100644 --- a/test/lib/pgBackRestTest/Module/Manifest/ManifestAllTest.pm +++ b/test/lib/pgBackRestTest/Module/Manifest/ManifestAllTest.pm @@ -136,7 +136,7 @@ sub run $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); $self->optionTestSet(CFGOPT_REPO_PATH, $self->{strRepoPath}); - $self->optionTestSet(CFGOPT_DB_PATH, $self->{strDbPath}); + $self->optionTestSet(CFGOPT_PG_PATH, $self->{strDbPath}); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); my $strBackupLabel = backupLabelFormat(CFGOPTVAL_BACKUP_TYPE_FULL, undef, 1482000000); diff --git a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm index 5feb4371e..7387fa105 100644 --- a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm +++ b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm @@ -335,9 +335,9 @@ sub run # Pass ssh path to make sure it is used ($bRemote ? ' --' . cfgOptionName(CFGOPT_CMD_SSH) . '=/usr/bin/ssh' : '') . # Pass bogus ssh port to make sure it is passed through the protocol layer (it won't be used) - ($bRemote ? ' --' . cfgOptionName(CFGOPT_DB_PORT) . '=9999' : '') . + ($bRemote ? ' --' . cfgOptionName(CFGOPT_PG_PORT) . '=9999' : '') . # Pass bogus socket path to make sure it is passed through the protocol layer (it won't be used) - ($bRemote ? ' --' . cfgOptionName(CFGOPT_DB_SOCKET_PATH) . ' =/test_socket_path' : '') . + ($bRemote ? ' --' . cfgOptionName(CFGOPT_PG_SOCKET_PATH) . ' =/test_socket_path' : '') . ' --' . cfgOptionName(CFGOPT_BUFFER_SIZE) . '=16384 --' . cfgOptionName(CFGOPT_CHECKSUM_PAGE) . ' --' . cfgOptionName(CFGOPT_PROCESS_MAX) . '=1', strRepoType => $bS3 ? undef : CFGOPTVAL_REPO_TYPE_CIFS, strTest => $strTestPoint, fTestDelay => 0}); @@ -589,7 +589,7 @@ sub run $oHostBackup->restore( 'on backup host', $strFullBackup, {rhExpectedManifest => \%oManifest, strUser => TEST_USER, - strOptionalParam => "${strLogReduced} --no-db1-host --db-path=${strBackupHostDbPath}"}); + strOptionalParam => "${strLogReduced} --no-pg1-host --pg1-path=${strBackupHostDbPath}"}); $oHostDbMaster->backup( $strType, 'backup errors on db host', @@ -1081,7 +1081,7 @@ sub run # Enable hardlinks (except for s3) to ensure a warning is raised if (!$bS3) { - $oHostBackup->configUpdate({&CFGDEF_SECTION_GLOBAL => {cfgOptionName(CFGOPT_HARDLINK) => 'y'}}); + $oHostBackup->configUpdate({&CFGDEF_SECTION_GLOBAL => {cfgOptionName(CFGOPT_REPO_HARDLINK) => 'y'}}); } $oBackupExecute = $oHostBackup->backupBegin( diff --git a/test/lib/pgBackRestTest/Module/Performance/PerformanceIoTest.pm b/test/lib/pgBackRestTest/Module/Performance/PerformanceIoTest.pm index 316dc00f5..beed45a0e 100644 --- a/test/lib/pgBackRestTest/Module/Performance/PerformanceIoTest.pm +++ b/test/lib/pgBackRestTest/Module/Performance/PerformanceIoTest.pm @@ -62,11 +62,11 @@ sub run { # Setup the remote for testing remote storage $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); - $self->optionTestSet(CFGOPT_DB_PATH, $self->testPath()); + $self->optionTestSet(CFGOPT_PG_PATH, $self->testPath()); $self->optionTestSet(CFGOPT_REPO_PATH, $self->testPath()); $self->optionTestSet(CFGOPT_LOG_PATH, $self->testPath()); - $self->optionTestSet(CFGOPT_BACKUP_HOST, 'localhost'); - $self->optionTestSet(CFGOPT_BACKUP_USER, $self->backrestUser()); + $self->optionTestSet(CFGOPT_REPO_HOST, 'localhost'); + $self->optionTestSet(CFGOPT_REPO_HOST_USER, $self->backrestUser()); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); protocolGet(CFGOPTVAL_REMOTE_TYPE_BACKUP, undef, {strBackRestBin => $self->backrestExe()}); diff --git a/test/lib/pgBackRestTest/Module/Protocol/ProtocolHelperTest.pm b/test/lib/pgBackRestTest/Module/Protocol/ProtocolHelperTest.pm index 0e96573f6..4bbd17836 100644 --- a/test/lib/pgBackRestTest/Module/Protocol/ProtocolHelperTest.pm +++ b/test/lib/pgBackRestTest/Module/Protocol/ProtocolHelperTest.pm @@ -63,7 +63,7 @@ sub initOption $self->configTestClear(); $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); - $self->optionTestSet(CFGOPT_DB_PATH, $self->{strDbPath}); + $self->optionTestSet(CFGOPT_PG_PATH, $self->{strDbPath}); $self->optionTestSet(CFGOPT_REPO_PATH, $self->{strRepoPath}); $self->optionTestSet(CFGOPT_LOG_PATH, $self->testPath()); $self->optionTestSetBool(CFGOPT_COMPRESS, false); @@ -84,20 +84,20 @@ sub run if ($self->begin('protocolParam()')) { $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_HOST, 1), 'db-host-1'); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_PATH, 1), '/db1'); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_PORT, 1), '1111'); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_CMD, 1), 'pgbackrest1'); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_HOST, 2), 'db-host-2'); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_PATH, 2), '/db2'); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_PORT, 2), '2222'); - $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_DB_CMD, 2), 'pgbackrest2'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_HOST, 1), 'pg-host-1'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_PATH, 1), '/db1'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_PORT, 1), '1111'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, 1), 'pgbackrest1'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_HOST, 2), 'pg-host-2'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_PATH, 2), '/db2'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_PORT, 2), '2222'); + $self->optionTestSet(cfgOptionIdFromIndex(CFGOPT_PG_HOST_CMD, 2), 'pgbackrest2'); $self->configTestLoad(CFGCMD_BACKUP); $self->testResult( sub {pgBackRest::Protocol::Helper::protocolParam(cfgCommandName(CFGCMD_BACKUP), CFGOPTVAL_REMOTE_TYPE_DB, 2)}, - '(db-host-2, postgres, [undef], pgbackrest2 --buffer-size=4194304 --command=backup --compress-level=6' . - ' --compress-level-network=3 --db1-path=/db2 --db1-port=2222 --protocol-timeout=1830 --stanza=db --type=db remote)', + '(pg-host-2, postgres, [undef], pgbackrest2 --buffer-size=4194304 --command=backup --compress-level=6' . + ' --compress-level-network=3 --pg1-path=/db2 --pg1-port=2222 --protocol-timeout=1830 --stanza=db --type=db remote)', 'more than one backup db host'); } @@ -105,8 +105,8 @@ sub run if ($self->begin("Protocol::Helper")) { $self->initOption(); - $self->optionTestSet(CFGOPT_BACKUP_HOST, 'localhost'); - $self->optionTestSet(CFGOPT_BACKUP_USER, $self->pgUser()); + $self->optionTestSet(CFGOPT_REPO_HOST, 'localhost'); + $self->optionTestSet(CFGOPT_REPO_HOST_USER, $self->pgUser()); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); $self->testResult( @@ -116,7 +116,7 @@ sub run # Destroy protocol object protocolDestroy(); - $self->optionTestSet(CFGOPT_BACKUP_SSH_PORT, 25); + $self->optionTestSet(CFGOPT_REPO_HOST_PORT, 25); $self->configTestLoad(CFGCMD_ARCHIVE_PUSH); $self->testException( diff --git a/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm b/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm index dc346992b..89c9e329b 100644 --- a/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm +++ b/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm @@ -311,7 +311,7 @@ sub run forceStorageRemove(storageRepo(), STORAGE_REPO_BACKUP . qw{/} . FILE_BACKUP_INFO . INI_COPY_EXT); } - # Change the database version by copying a new pg_control file to a new db-path to use for db mismatch test + # Change the database version by copying a new pg_control file to a new pg-path to use for db mismatch test storageDb()->pathCreate( $oHostDbMaster->dbPath() . '/testbase/' . DB_PATH_GLOBAL, {strMode => '0700', bIgnoreExists => true, bCreateParent => true}); @@ -320,9 +320,9 @@ sub run if (!$bRepoEncrypt) { - # Run stanza-create online to confirm proper handling of configValidation error against new db-path + # Run stanza-create online to confirm proper handling of configValidation error against new pg-path $oHostBackup->stanzaCreate('fail on database mismatch with directory', - {strOptionalParam => ' --' . $oHostBackup->optionIndexName(CFGOPT_DB_PATH, 1) . '=' . $oHostDbMaster->dbPath() . + {strOptionalParam => ' --' . cfgOptionName(CFGOPT_PG_PATH) . '=' . $oHostDbMaster->dbPath() . '/testbase/', iExpectedExitStatus => ERROR_DB_MISMATCH}); } # If encrypted, need to clean out repo and recreate @@ -334,10 +334,10 @@ sub run # Stanza Upgrade - tests configValidate code - all other tests in synthetic integration tests #----------------------------------------------------------------------------------------------------------------------- - # Run stanza-create offline with --force to create files needing to be upgraded (using new db-path) + # Run stanza-create offline with --force to create files needing to be upgraded (using new pg-path) $oHostBackup->stanzaCreate('successfully create stanza files to be upgraded', {strOptionalParam => - ' --' . $oHostBackup->optionIndexName(CFGOPT_DB_PATH, 1) . '=' . $oHostDbMaster->dbPath() . + ' --' . cfgOptionName(CFGOPT_PG_PATH) . '=' . $oHostDbMaster->dbPath() . '/testbase/ --no-' . cfgOptionName(CFGOPT_ONLINE) . ' --' . cfgOptionName(CFGOPT_FORCE)}); my $oAchiveInfo = new pgBackRest::Archive::Info(storageRepo()->pathGet('archive/' . $self->stanza())); my $oBackupInfo = new pgBackRest::Backup::Info(storageRepo()->pathGet('backup/' . $self->stanza())); @@ -346,19 +346,19 @@ sub run if ($self->pgVersion() eq PG_VERSION_94) { $self->testResult(sub {$oAchiveInfo->test(INFO_ARCHIVE_SECTION_DB, INFO_ARCHIVE_KEY_DB_VERSION, undef, - PG_VERSION_95)}, true, 'archive upgrade forced with db-mismatch'); + PG_VERSION_95)}, true, 'archive upgrade forced with pg mismatch'); $self->testResult(sub {$oBackupInfo->test(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_DB_VERSION, undef, - PG_VERSION_95)}, true, 'backup upgrade forced with db-mismatch'); + PG_VERSION_95)}, true, 'backup upgrade forced with pg mismatch'); } else { $self->testResult(sub {$oAchiveInfo->test(INFO_ARCHIVE_SECTION_DB, INFO_ARCHIVE_KEY_DB_VERSION, undef, - PG_VERSION_94)}, true, 'archive create forced with db-mismatch in prep for stanza-upgrade'); + PG_VERSION_94)}, true, 'archive create forced with pg mismatch in prep for stanza-upgrade'); $self->testResult(sub {$oBackupInfo->test(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_DB_VERSION, undef, - PG_VERSION_94)}, true, 'backup create forced with db-mismatch in prep for stanza-upgrade'); + PG_VERSION_94)}, true, 'backup create forced with pg mismatch in prep for stanza-upgrade'); } - # Run stanza-upgrade online with the default db-path to correct the info files + # Run stanza-upgrade online with the default pg-path to correct the info files $oHostBackup->stanzaUpgrade('upgrade stanza files online'); # Reread the info files and confirm the result @@ -460,7 +460,7 @@ sub run if ($oHostDbStandby->pgVersion() >= PG_VERSION_BACKUP_STANDBY) { - # If there is only a master and a replica and the replica is the backup destination, then if db2-host and db3-host + # If there is only a master and a replica and the replica is the backup destination, then if pg2-host and pg3-host # are BOGUS, confirm failure to reach the master if (!$bHostBackup && $bHostStandby && $strBackupDestination eq HOST_DB_STANDBY) { @@ -469,7 +469,7 @@ sub run {bStandby => true, iExpectedExitStatus => ERROR_DB_CONNECT, strOptionalParam => '--' . - $oHostBackup->optionIndexName(CFGOPT_DB_HOST, cfgOptionIndexTotal(CFGOPT_DB_PATH)) . '=' . BOGUS}); + cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST, cfgOptionIndexTotal(CFGOPT_PG_PATH))) . '=' . BOGUS}); } else { @@ -478,7 +478,7 @@ sub run {bStandby => true, iExpectedExitStatus => ERROR_HOST_CONNECT, strOptionalParam => '--' . - $oHostBackup->optionIndexName(CFGOPT_DB_HOST, cfgOptionIndexTotal(CFGOPT_DB_PATH)) . '=' . BOGUS}); + cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST, cfgOptionIndexTotal(CFGOPT_PG_PATH))) . '=' . BOGUS}); } } @@ -499,14 +499,14 @@ sub run executeTest("sudo chown root:root ${strDir}"); executeTest("sudo chmod 400 ${strDir}"); - # Determine if there is an invalid db-host from the config file + # Determine if there is an invalid pg-host from the config file my $rhConfig = iniParse(${storageTest()->get($oHostDbStandby->backrestConfig())}, {bRelaxed => true}); my $bBogusHost = false; - for (my $iRemoteIdx = 1; $iRemoteIdx <= cfgOptionIndexTotal(CFGOPT_DB_HOST); $iRemoteIdx++) + for (my $iRemoteIdx = 1; $iRemoteIdx <= cfgOptionIndexTotal(CFGOPT_PG_HOST); $iRemoteIdx++) { - if (defined($rhConfig->{$self->stanza()}{$oHostDbStandby->optionIndexName(CFGOPT_DB_HOST, $iRemoteIdx)}) && - ($rhConfig->{$self->stanza()}{$oHostDbStandby->optionIndexName(CFGOPT_DB_HOST, $iRemoteIdx)} eq BOGUS)) + if (defined($rhConfig->{$self->stanza()}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iRemoteIdx))}) && + ($rhConfig->{$self->stanza()}{cfgOptionName(cfgOptionIdFromIndex(CFGOPT_PG_HOST, $iRemoteIdx))} eq BOGUS)) { $bBogusHost = true; last; diff --git a/test/lib/pgBackRestTest/Module/Real/RealHelpTest.pm b/test/lib/pgBackRestTest/Module/Real/RealHelpTest.pm index d26ee5b0a..879692b94 100644 --- a/test/lib/pgBackRestTest/Module/Real/RealHelpTest.pm +++ b/test/lib/pgBackRestTest/Module/Real/RealHelpTest.pm @@ -44,7 +44,7 @@ sub run $self->helpExecute(cfgCommandName(CFGCMD_VERSION)); $self->helpExecute(cfgCommandName(CFGCMD_HELP)); $self->helpExecute(cfgCommandName(CFGCMD_HELP) . ' version'); - $self->helpExecute(cfgCommandName(CFGCMD_HELP) . ' --output=json --stanza=main --backup-host=backup info'); + $self->helpExecute(cfgCommandName(CFGCMD_HELP) . ' --output=json --stanza=main --repo1-host=backup info'); $self->helpExecute(cfgCommandName(CFGCMD_HELP) . ' --output=json --stanza=main info output'); $self->helpExecute(cfgCommandName(CFGCMD_HELP) . ' check'); } diff --git a/test/lib/pgBackRestTest/Module/Stanza/StanzaAllTest.pm b/test/lib/pgBackRestTest/Module/Stanza/StanzaAllTest.pm index 43862348c..8fe5fbd36 100644 --- a/test/lib/pgBackRestTest/Module/Stanza/StanzaAllTest.pm +++ b/test/lib/pgBackRestTest/Module/Stanza/StanzaAllTest.pm @@ -79,7 +79,7 @@ sub run my $self = shift; $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); - $self->optionTestSet(CFGOPT_DB_PATH, $self->{strDbPath}); + $self->optionTestSet(CFGOPT_PG_PATH, $self->{strDbPath}); $self->optionTestSet(CFGOPT_REPO_PATH, $self->{strRepoPath}); $self->optionTestSet(CFGOPT_LOG_PATH, $self->testPath()); diff --git a/test/lib/pgBackRestTest/Module/Storage/StorageHelperPerlTest.pm b/test/lib/pgBackRestTest/Module/Storage/StorageHelperPerlTest.pm index c0513f819..e02ca68bb 100644 --- a/test/lib/pgBackRestTest/Module/Storage/StorageHelperPerlTest.pm +++ b/test/lib/pgBackRestTest/Module/Storage/StorageHelperPerlTest.pm @@ -50,7 +50,7 @@ sub run my $iFileSize = length($strFileContent); # Setup parameters - $self->optionTestSet(CFGOPT_DB_PATH, $self->testPath() . '/db'); + $self->optionTestSet(CFGOPT_PG_PATH, $self->testPath() . '/db'); $self->optionTestSet(CFGOPT_REPO_PATH, $self->testPath() . '/repo'); $self->optionTestSet(CFGOPT_SPOOL_PATH, $self->testPath() . '/spool'); $self->optionTestSet(CFGOPT_STANZA, $self->stanza()); diff --git a/test/src/module/command/commandTest.c b/test/src/module/command/commandTest.c index c0740b13a..38cc50872 100644 --- a/test/src/module/command/commandTest.c +++ b/test/src/module/command/commandTest.c @@ -27,11 +27,11 @@ testRun() cfgOptionNegateSet(cfgOptConfig, true); cfgOptionSet(cfgOptConfig, cfgSourceParam, NULL); - cfgOptionValidSet(cfgOptDbHost, true); - cfgOptionSet(cfgOptDbHost, cfgSourceConfig, NULL); + cfgOptionValidSet(cfgOptPgHost, true); + cfgOptionSet(cfgOptPgHost, cfgSourceConfig, NULL); - cfgOptionValidSet(cfgOptBackupHost, true); - cfgOptionSet(cfgOptBackupHost, cfgSourceConfig, varNewStr(strNew("backup1"))); + cfgOptionValidSet(cfgOptRepoHost, true); + cfgOptionSet(cfgOptRepoHost, cfgSourceConfig, varNewStr(strNew("backup1"))); cfgOptionValidSet(cfgOptRepoPath, true); cfgOptionSet(cfgOptRepoPath, cfgSourceConfig, varNewStr(strNew("/path/to the/repo"))); @@ -41,8 +41,8 @@ testRun() cmdBegin(); testLogResult( - "P00 INFO: archive-get command begin " PGBACKREST_VERSION ": --backup-host=backup1 --compress --no-config " - "--repo-path=\"/path/to the/repo\" --repo-s3-key="); + "P00 INFO: archive-get command begin " PGBACKREST_VERSION ": --compress --no-config --repo1-host=backup1 " + "--repo1-path=\"/path/to the/repo\" --repo1-s3-key="); // ------------------------------------------------------------------------------------------------------------------------- cmdEnd(0); diff --git a/test/src/module/common/iniTest.c b/test/src/module/common/iniTest.c index 0dba30ece..ce3619d8f 100644 --- a/test/src/module/common/iniTest.c +++ b/test/src/module/common/iniTest.c @@ -65,13 +65,13 @@ testRun() "compress=y \n" "\n" " [db]\n" - "db-path = /path/to/pg" + "pg1-path = /path/to/pg" ); TEST_RESULT_VOID(iniParse(ini, content), "load ini"); TEST_RESULT_STR(strPtr(varStr(iniGet(ini, strNew("global"), strNew("compress")))), "y", "get compress"); - TEST_RESULT_STR(strPtr(varStr(iniGet(ini, strNew("db"), strNew("db-path")))), "/path/to/pg", "get db-path"); + TEST_RESULT_STR(strPtr(varStr(iniGet(ini, strNew("db"), strNew("pg1-path")))), "/path/to/pg", "get pg1-path"); // ------------------------------------------------------------------------------------------------------------------------- TEST_ASSIGN(ini, iniNew(), "new ini"); @@ -84,7 +84,7 @@ testRun() " \n" " compress= y \n" "[db]\t\r\n" - " db-path =/path/to/pg\n" + " pg1-path =/path/to/pg\n" "\n" ); @@ -92,6 +92,6 @@ testRun() TEST_RESULT_VOID(iniLoad(ini, fileName), "load ini from file"); TEST_RESULT_STR(strPtr(varStr(iniGet(ini, strNew("global"), strNew("compress")))), "y", "get compress"); - TEST_RESULT_STR(strPtr(varStr(iniGet(ini, strNew("db"), strNew("db-path")))), "/path/to/pg", "get db-path"); + TEST_RESULT_STR(strPtr(varStr(iniGet(ini, strNew("db"), strNew("pg1-path")))), "/path/to/pg", "get pg1-path"); } } diff --git a/test/src/module/config/configTest.c b/test/src/module/config/configTest.c index 706a36ea2..33447c0f5 100644 --- a/test/src/module/config/configTest.c +++ b/test/src/module/config/configTest.c @@ -50,19 +50,19 @@ testRun() TEST_ERROR(cfgCommandName(-1), AssertError, commandIdInvalidLowError); TEST_RESULT_STR(cfgCommandName(cfgCmdBackup), "backup", "command name from id"); - TEST_RESULT_INT(cfgOptionDefIdFromId(cfgOptDbHost + 6), cfgDefOptDbHost, "option id to def id"); + TEST_RESULT_INT(cfgOptionDefIdFromId(cfgOptPgHost + 6), cfgDefOptPgHost, "option id to def id"); TEST_RESULT_INT(cfgOptionId("target"), cfgOptTarget, "option id from name"); TEST_RESULT_INT(cfgOptionId(BOGUS_STR), -1, "option id from invalid option name"); TEST_ERROR(cfgOptionIdFromDefId(cfgDefOptionTotal(), 6), AssertError, optionDefIdInvalidHighError); - TEST_RESULT_INT(cfgOptionIdFromDefId(cfgDefOptDbHost, 6), cfgOptDbHost + 6, "option def id to id"); + TEST_RESULT_INT(cfgOptionIdFromDefId(cfgDefOptPgHost, 6), cfgOptPgHost + 6, "option def id to id"); TEST_ERROR(cfgOptionIndex(CFG_OPTION_TOTAL), AssertError, optionIdInvalidHighError); - TEST_RESULT_INT(cfgOptionIndex(cfgOptDbCmd + 6), 6, "option index"); + TEST_RESULT_INT(cfgOptionIndex(cfgOptPgHostCmd + 6), 6, "option index"); TEST_RESULT_INT(cfgOptionIndex(cfgOptCompressLevel), 0, "option index"); - TEST_RESULT_INT(cfgOptionIndexTotal(cfgOptDbPath), 8, "option index total"); + TEST_RESULT_INT(cfgOptionIndexTotal(cfgOptPgPath), 8, "option index total"); TEST_RESULT_INT(cfgOptionIndexTotal(cfgOptLogLevelConsole), 1, "option index total"); TEST_ERROR(cfgOptionName(-1), AssertError, optionIdInvalidLowError); @@ -170,16 +170,16 @@ testRun() TEST_RESULT_INT(varInt(cfgOptionDefault(cfgOptCompressLevel)), 6, "backup compress-level default"); TEST_RESULT_PTR(cfgOptionDefault(cfgOptDbInclude), NULL, "backup db-include default is null"); - TEST_RESULT_VOID(cfgOptionSet(cfgOptDbHost, cfgSourceParam, varNewStrZ("backup")), "backup host set"); - TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptDbHost, varNewStrZ("backup-default")), "backup host default"); - TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptDbHost, varNewStrZ("backup-default2")), "reset backup host default"); - TEST_RESULT_STR(strPtr(varStr(cfgOption(cfgOptDbHost))), "backup", "backup host value"); - TEST_RESULT_STR(strPtr(varStr(cfgOptionDefault(cfgOptDbHost))), "backup-default2", "backup host default"); + TEST_RESULT_VOID(cfgOptionSet(cfgOptPgHost, cfgSourceParam, varNewStrZ("backup")), "backup host set"); + TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptPgHost, varNewStrZ("backup-default")), "backup host default"); + TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptPgHost, varNewStrZ("backup-default2")), "reset backup host default"); + TEST_RESULT_STR(strPtr(varStr(cfgOption(cfgOptPgHost))), "backup", "backup host value"); + TEST_RESULT_STR(strPtr(varStr(cfgOptionDefault(cfgOptPgHost))), "backup-default2", "backup host default"); - TEST_RESULT_VOID(cfgOptionSet(cfgOptDbSocketPath, cfgSourceDefault, NULL), "backup db-socket-path set"); - TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptDbSocketPath, varNewStrZ("/to/socket")), "backup db-socket-path default"); - TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptDbSocketPath, varNewStrZ("/to/socket2")), "reset backup db-socket-path default"); - TEST_RESULT_STR(strPtr(varStr(cfgOption(cfgOptDbSocketPath))), "/to/socket2", "backup db-socket-path value"); - TEST_RESULT_STR(strPtr(varStr(cfgOptionDefault(cfgOptDbSocketPath))), "/to/socket2", "backup db-socket-path value default"); + TEST_RESULT_VOID(cfgOptionSet(cfgOptPgSocketPath, cfgSourceDefault, NULL), "backup pg-socket-path set"); + TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptPgSocketPath, varNewStrZ("/to/socket")), "backup pg-socket-path default"); + TEST_RESULT_VOID(cfgOptionDefaultSet(cfgOptPgSocketPath, varNewStrZ("/to/socket2")), "reset backup pg-socket-path default"); + TEST_RESULT_STR(strPtr(varStr(cfgOption(cfgOptPgSocketPath))), "/to/socket2", "backup pg-socket-path value"); + TEST_RESULT_STR(strPtr(varStr(cfgOptionDefault(cfgOptPgSocketPath))), "/to/socket2", "backup pg-socket-path value default"); } } diff --git a/test/src/module/config/defineTest.c b/test/src/module/config/defineTest.c index c49b6fa20..741345c07 100644 --- a/test/src/module/config/defineTest.c +++ b/test/src/module/config/defineTest.c @@ -39,8 +39,11 @@ testRun() TEST_RESULT_STR(cfgDefOptionName(cfgDefOptConfig), "config", "option name"); TEST_ERROR(cfgDefOptionName(-1), AssertError, optionIdInvalidLowError); + TEST_RESULT_INT(cfgDefOptionId("repo-host"), cfgDefOptRepoHost, "define id"); + TEST_RESULT_INT(cfgDefOptionId(BOGUS_STR), -1, "invalid define id"); + TEST_RESULT_BOOL(cfgDefOptionAllowList(cfgDefCmdBackup, cfgDefOptLogLevelConsole), true, "allow list valid"); - TEST_RESULT_BOOL(cfgDefOptionAllowList(cfgDefCmdBackup, cfgDefOptDbHost), false, "allow list not valid"); + TEST_RESULT_BOOL(cfgDefOptionAllowList(cfgDefCmdBackup, cfgDefOptPgHost), false, "allow list not valid"); TEST_RESULT_BOOL(cfgDefOptionAllowList(cfgDefCmdBackup, cfgDefOptType), true, "command allow list valid"); TEST_RESULT_INT(cfgDefOptionAllowListValueTotal(cfgDefCmdBackup, cfgDefOptType), 3, "allow list total"); @@ -58,7 +61,7 @@ testRun() cfgDefOptionAllowListValueValid(cfgDefCmdBackup, cfgDefOptType, BOGUS_STR), false, "allow list value not valid"); TEST_RESULT_BOOL(cfgDefOptionAllowRange(cfgDefCmdBackup, cfgDefOptCompressLevel), true, "range allowed"); - TEST_RESULT_BOOL(cfgDefOptionAllowRange(cfgDefCmdBackup, cfgDefOptBackupHost), false, "range not allowed"); + TEST_RESULT_BOOL(cfgDefOptionAllowRange(cfgDefCmdBackup, cfgDefOptRepoHost), false, "range not allowed"); TEST_RESULT_DOUBLE(cfgDefOptionAllowRangeMin(cfgDefCmdBackup, cfgDefOptDbTimeout), 0.1, "range min"); TEST_RESULT_DOUBLE(cfgDefOptionAllowRangeMax(cfgDefCmdBackup, cfgDefOptCompressLevel), 9, "range max"); @@ -68,13 +71,13 @@ testRun() TEST_RESULT_STR(cfgDefOptionDefault(cfgDefCmdBackup, cfgDefOptCompressLevel), "6", "option default exists"); TEST_RESULT_STR(cfgDefOptionDefault(cfgDefCmdRestore, cfgDefOptType), "default", "command default exists"); TEST_RESULT_STR(cfgDefOptionDefault(cfgDefCmdLocal, cfgDefOptType), NULL, "command default does not exist"); - TEST_RESULT_STR(cfgDefOptionDefault(cfgDefCmdBackup, cfgDefOptBackupHost), NULL, "default does not exist"); + TEST_RESULT_STR(cfgDefOptionDefault(cfgDefCmdBackup, cfgDefOptRepoHost), NULL, "default does not exist"); TEST_RESULT_BOOL(cfgDefOptionDepend(cfgDefCmdRestore, cfgDefOptRepoS3Key), true, "has depend option"); TEST_RESULT_BOOL(cfgDefOptionDepend(cfgDefCmdRestore, cfgDefOptType), false, "does not have depend option"); - TEST_RESULT_INT(cfgDefOptionDependOption(cfgDefCmdBackup, cfgDefOptDbUser), cfgDefOptDbHost, "depend option id"); - TEST_RESULT_INT(cfgDefOptionDependOption(cfgDefCmdBackup, cfgDefOptBackupCmd), cfgDefOptBackupHost, "depend option id"); + TEST_RESULT_INT(cfgDefOptionDependOption(cfgDefCmdBackup, cfgDefOptPgHostUser), cfgDefOptPgHost, "depend option id"); + TEST_RESULT_INT(cfgDefOptionDependOption(cfgDefCmdBackup, cfgDefOptRepoHostCmd), cfgDefOptRepoHost, "depend option id"); TEST_RESULT_INT(cfgDefOptionDependValueTotal(cfgDefCmdRestore, cfgDefOptTarget), 3, "depend option value total"); TEST_RESULT_STR(cfgDefOptionDependValue(cfgDefCmdRestore, cfgDefOptTarget, 0), "name", "depend option value 0"); @@ -90,33 +93,30 @@ testRun() cfgDefOptionDependValueValid(cfgDefCmdRestore, cfgDefOptTarget, BOGUS_STR), false, "depend option value not valid"); TEST_ERROR(cfgDefOptionIndexTotal(cfgDefOptionTotal()), AssertError, optionIdInvalidHighError); - TEST_RESULT_INT(cfgDefOptionIndexTotal(cfgDefOptDbPath), 8, "index total > 1"); + 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_STR(cfgDefOptionNameAlt(cfgDefOptProcessMax), "thread-max", "alt name"); - TEST_RESULT_STR(cfgDefOptionNameAlt(cfgDefOptType), NULL, "no alt name"); - TEST_ERROR(cfgDefOptionNegate(cfgDefOptionTotal()), AssertError, optionIdInvalidHighError); TEST_RESULT_BOOL(cfgDefOptionNegate(cfgDefOptOnline), true, "option can be negated"); TEST_RESULT_BOOL(cfgDefOptionNegate(cfgDefOptType), false, "option cannot be negated"); - TEST_RESULT_STR(cfgDefOptionPrefix(cfgDefOptDbHost), "db", "option prefix"); + TEST_RESULT_STR(cfgDefOptionPrefix(cfgDefOptPgHost), "pg", "option prefix"); TEST_RESULT_STR(cfgDefOptionPrefix(cfgDefOptType), NULL, "option has no prefix"); TEST_RESULT_BOOL(cfgDefOptionRequired(cfgDefCmdBackup, cfgDefOptConfig), true, "option required"); - TEST_RESULT_BOOL(cfgDefOptionRequired(cfgDefCmdRestore, cfgDefOptBackupHost), false, "option not required"); + TEST_RESULT_BOOL(cfgDefOptionRequired(cfgDefCmdRestore, cfgDefOptRepoHost), false, "option not required"); TEST_RESULT_BOOL(cfgDefOptionRequired(cfgDefCmdInfo, cfgDefOptStanza), false, "command option not required"); TEST_RESULT_INT(cfgDefOptionSection(cfgDefOptRepoS3Key), cfgDefSectionGlobal, "global section"); - TEST_RESULT_INT(cfgDefOptionSection(cfgDefOptDbPath), cfgDefSectionStanza, "stanza section"); + TEST_RESULT_INT(cfgDefOptionSection(cfgDefOptPgPath), cfgDefSectionStanza, "stanza section"); TEST_RESULT_INT(cfgDefOptionSection(cfgDefOptType), cfgDefSectionCommandLine, "command line only"); TEST_ERROR(cfgDefOptionSecure(-1), AssertError, optionIdInvalidLowError); TEST_RESULT_BOOL(cfgDefOptionSecure(cfgDefOptRepoS3Key), true, "option secure"); - TEST_RESULT_BOOL(cfgDefOptionSecure(cfgDefOptBackupHost), false, "option not secure"); + TEST_RESULT_BOOL(cfgDefOptionSecure(cfgDefOptRepoHost), false, "option not secure"); TEST_ERROR(cfgDefOptionType(-1), AssertError, optionIdInvalidLowError); TEST_RESULT_INT(cfgDefOptionType(cfgDefOptType), cfgDefOptTypeString, "string type"); @@ -130,6 +130,13 @@ testRun() // ----------------------------------------------------------------------------------------------------------------------------- if (testBegin("cfgDefCommandHelp*() and cfgDefOptionHelp*()")) { + TEST_RESULT_BOOL(cfgDefOptionHelpNameAlt(cfgDefOptRepoHost), true, "name alt exists"); + TEST_RESULT_BOOL(cfgDefOptionHelpNameAlt(cfgDefOptSet), false, "name alt not exists"); + TEST_RESULT_INT(cfgDefOptionHelpNameAltValueTotal(cfgDefOptRepoHost), 1, "name alt value total"); + TEST_RESULT_STR(cfgDefOptionHelpNameAltValue(cfgDefOptRepoHost, 0), "backup-host", "name alt value 0"); + TEST_ERROR( + cfgDefOptionHelpNameAltValue(cfgDefOptRepoHost, 1), AssertError, "value id 1 invalid - must be >= 0 and < 1"); + TEST_RESULT_STR(cfgDefCommandHelpSummary(cfgDefCmdBackup), "Backup a database cluster.", "backup command help summary"); TEST_RESULT_STR( cfgDefCommandHelpDescription(cfgDefCmdBackup), diff --git a/test/src/module/config/loadTest.c b/test/src/module/config/loadTest.c index 5848a6b68..0f15a11d9 100644 --- a/test/src/module/config/loadTest.c +++ b/test/src/module/config/loadTest.c @@ -42,8 +42,8 @@ testRun() argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); strLstAdd(argList, strNew("--stanza=db")); - strLstAdd(argList, strNew("--db-path=/path/to/db")); - strLstAdd(argList, strNew("--repo-path=/path/to/repo")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); + strLstAdd(argList, strNew("--repo1-path=/path/to/repo")); strLstAdd(argList, strNew("stanza-create")); TEST_RESULT_VOID(cfgLoad(strLstSize(argList), strLstPtr(argList)), "load local config"); @@ -58,45 +58,46 @@ testRun() strLstAdd(argList, strNew("archive-push")); TEST_RESULT_VOID(cfgLoad(strLstSize(argList), strLstPtr(argList)), "load archive-push config"); - TEST_RESULT_PTR(cfgOptionDefault(cfgOptBackupCmd), NULL, " command archive-push, option backup-cmd default"); + TEST_RESULT_PTR(cfgOptionDefault(cfgOptRepoHostCmd), NULL, " command archive-push, option repo1-host-cmd default"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); strLstAdd(argList, strNew("--stanza=db")); - strLstAdd(argList, strNew("--backup-host=backup")); + strLstAdd(argList, strNew("--repo1-host=backup")); strLstAdd(argList, strNew("archive-push")); TEST_RESULT_VOID(cfgLoad(strLstSize(argList), strLstPtr(argList)), "load archive-push config"); TEST_RESULT_STR( - strPtr(varStr(cfgOptionDefault(cfgOptBackupCmd))), strPtr(cfgExe()), - " command archive-push, option backup-cmd default"); + strPtr(varStr(cfgOptionDefault(cfgOptRepoHostCmd))), strPtr(cfgExe()), + " command archive-push, option repo1-host-cmd default"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("backup")); TEST_RESULT_VOID(cfgLoad(strLstSize(argList), strLstPtr(argList)), "load backup config"); - TEST_RESULT_PTR(cfgOptionDefault(cfgOptDbCmd), NULL, " command backup, option db1-cmd default"); + TEST_RESULT_PTR(cfgOptionDefault(cfgOptPgHostCmd), NULL, " command backup, option pg1-host-cmd default"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew("pgbackrest")); - strLstAdd(argList, strNew("--db-host=db")); - strLstAdd(argList, strNew("--db-path=/path/to/db")); - strLstAdd(argList, strNew("--db3-host=db")); - strLstAdd(argList, strNew("--db3-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-host=db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); + strLstAdd(argList, strNew("--pg3-host=db")); + strLstAdd(argList, strNew("--pg3-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("backup")); TEST_RESULT_VOID(cfgLoad(strLstSize(argList), strLstPtr(argList)), "load backup config"); TEST_RESULT_STR( - strPtr(varStr(cfgOptionDefault(cfgOptDbCmd))), strPtr(cfgExe()), " command backup, option db1-cmd default"); - TEST_RESULT_PTR(cfgOptionDefault(cfgOptDbCmd + 1), NULL, " command backup, option db2-cmd default"); + strPtr(varStr(cfgOptionDefault(cfgOptPgHostCmd))), strPtr(cfgExe()), " command backup, option pg1-host-cmd default"); + TEST_RESULT_PTR(cfgOptionDefault(cfgOptPgHostCmd + 1), NULL, " command backup, option pg2-host-cmd default"); TEST_RESULT_STR( - strPtr(varStr(cfgOptionDefault(cfgOptDbCmd + 2))), strPtr(cfgExe()), " command backup, option db3-cmd default"); + strPtr(varStr(cfgOptionDefault(cfgOptPgHostCmd + 2))), strPtr(cfgExe()), + " command backup, option pg3-host-cmd default"); } } diff --git a/test/src/module/config/parseTest.c b/test/src/module/config/parseTest.c index 1caf3861d..5d300a027 100644 --- a/test/src/module/config/parseTest.c +++ b/test/src/module/config/parseTest.c @@ -9,6 +9,19 @@ Test Configuration Parse #define TEST_COMMAND_RESTORE "restore" #define TEST_COMMAND_VERSION "version" +/*********************************************************************************************************************************** +Option find test -- this is done a lot in the deprecated tests +***********************************************************************************************************************************/ +static void +testOptionFind(const char *option, int value) +{ + // If not testing for a missing option, then add the option offset that is already added to each option in the list + if (value != 0) + value |= PARSE_OPTION_FLAG; + + TEST_RESULT_INT(optionList[optionFind(strNew(option))].val, value, "check %s", option); +} + /*********************************************************************************************************************************** Test run ***********************************************************************************************************************************/ @@ -36,9 +49,9 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-host")); + strLstAdd(argList, strNew("--pg1-host")); TEST_ERROR( - configParse(strLstSize(argList), strLstPtr(argList)), OptionInvalidError, "option '--db-host' requires argument"); + configParse(strLstSize(argList), strLstPtr(argList)), OptionInvalidError, "option '--pg1-host' requires argument"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); @@ -77,12 +90,12 @@ testRun() strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); TEST_ERROR( configParse(strLstSize(argList), strLstPtr(argList)), OptionRequiredError, - "backup command requires option: db1-path\nHINT: does this stanza exist?"); + "backup command requires option: pg1-path\nHINT: does this stanza exist?"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); TEST_ERROR( configParse(strLstSize(argList), strLstPtr(argList)), OptionRequiredError, @@ -91,30 +104,30 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--no-config")); strLstAdd(argList, strNew("--stanza=db")); - strLstAdd(argList, strNew("--repo-s3-key=xxx")); + strLstAdd(argList, strNew("--repo1-s3-key=xxx")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); TEST_ERROR( configParse(strLstSize(argList), strLstPtr(argList)), OptionInvalidError, - "option 'repo-s3-key' not valid without option 'repo-type' = 's3'"); + "option 'repo1-s3-key' not valid without option 'repo1-type' = 's3'"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); - strLstAdd(argList, strNew("--backup-user=xxx")); + 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)); TEST_ERROR( configParse(strLstSize(argList), strLstPtr(argList)), OptionInvalidError, - "option 'backup-user' not valid without option 'backup-host'"); + "option 'repo1-host-user' not valid without option 'repo1-host'"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--force")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); @@ -125,7 +138,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--test-delay=1")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); @@ -136,7 +149,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--recovery-option=a=b")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); @@ -147,7 +160,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--target-exclusive")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -158,7 +171,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--type=bogus")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -169,7 +182,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--process-max=0")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -180,7 +193,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--process-max=bogus")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -191,7 +204,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--protocol-timeout=.01")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -202,7 +215,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew("--protocol-timeout=bogus")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -284,9 +297,9 @@ testRun() argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); strLstAdd(argList, strNew("--stanza=db")); - strLstAdd(argList, strNew("--backup-host=backup")); - strLstAdd(argList, strNew("--backup-user=pgbackrest")); - strLstAdd(argList, strNew("--db-path=/path/to/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)); TEST_RESULT_VOID(configParse(strLstSize(argList), strLstPtr(argList)), TEST_COMMAND_BACKUP " command"); @@ -296,8 +309,8 @@ testRun() TEST_RESULT_STR(strPtr(cfgOptionStr(cfgOptStanza)), "db", " stanza is set"); TEST_RESULT_INT(cfgOptionSource(cfgOptStanza), cfgSourceParam, " stanza is source param"); - TEST_RESULT_STR(strPtr(cfgOptionStr(cfgOptDbPath)), "/path/to/db", " db-path is set"); - TEST_RESULT_INT(cfgOptionSource(cfgOptDbPath), cfgSourceParam, " db-path is source param"); + TEST_RESULT_STR(strPtr(cfgOptionStr(cfgOptPgPath)), "/path/to/db", " pg1-path is set"); + TEST_RESULT_INT(cfgOptionSource(cfgOptPgPath), cfgSourceParam, " pg1-path is source param"); TEST_RESULT_BOOL(cfgOptionBool(cfgOptOnline), false, " online is not set"); TEST_RESULT_INT(cfgOptionSource(cfgOptOnline), cfgSourceParam, " online is source default"); TEST_RESULT_BOOL(cfgOptionBool(cfgOptCompress), true, " compress is set"); @@ -311,7 +324,7 @@ testRun() strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNewFmt("--config=%s", strPtr(configFile))); strLstAdd(argList, strNew("--no-online")); - strLstAdd(argList, strNew("--db1-host=db")); + strLstAdd(argList, strNew("--pg1-host=db")); strLstAdd(argList, strNew(TEST_COMMAND_BACKUP)); storagePut(storageLocal(), configFile, bufNewStr(strNew( @@ -319,7 +332,7 @@ testRun() "compress-level=3\n" "\n" "[global:backup]\n" - "hardlink=y\n" + "repo1-hardlink=y\n" "bogus=bogus\n" "no-compress=y\n" "archive-copy=y\n" @@ -330,8 +343,8 @@ testRun() "recovery-option=a=b\n" "\n" "[db]\n" - "db1-host=db\n" - "db1-path=/path/to/db\n" + "pg1-host=db\n" + "pg1-path=/path/to/db\n" "recovery-option=c=d\n" ))); @@ -346,21 +359,21 @@ testRun() "WARN: '%s' contains command-line only option 'online'", strPtr(configFile), strPtr(configFile), strPtr(configFile), strPtr(configFile)))); - TEST_RESULT_STR(strPtr(cfgOptionStr(cfgOptDbPath)), "/path/to/db", " db-path is set"); - TEST_RESULT_INT(cfgOptionSource(cfgOptDbPath), cfgSourceConfig, " db-path is source config"); + TEST_RESULT_STR(strPtr(cfgOptionStr(cfgOptPgPath)), "/path/to/db", " pg1-path is set"); + TEST_RESULT_INT(cfgOptionSource(cfgOptPgPath), cfgSourceConfig, " pg1-path is source config"); TEST_RESULT_BOOL(cfgOptionBool(cfgOptCompress), false, " compress not is set"); TEST_RESULT_INT(cfgOptionSource(cfgOptCompress), cfgSourceConfig, " compress is source config"); TEST_RESULT_PTR(cfgOption(cfgOptArchiveCheck), NULL, " archive-check is not set"); TEST_RESULT_PTR(cfgOption(cfgOptArchiveCopy), NULL, " archive-copy is not set"); - TEST_RESULT_BOOL(cfgOptionBool(cfgOptHardlink), true, " hardlink is set"); - TEST_RESULT_INT(cfgOptionSource(cfgOptHardlink), cfgSourceConfig, " hardlink is source config"); + TEST_RESULT_BOOL(cfgOptionBool(cfgOptRepoHardlink), true, " repo-hardlink is set"); + TEST_RESULT_INT(cfgOptionSource(cfgOptRepoHardlink), cfgSourceConfig, " repo-hardlink is source config"); TEST_RESULT_INT(cfgOptionInt(cfgOptCompressLevel), 3, " compress-level is set"); TEST_RESULT_INT(cfgOptionSource(cfgOptCompressLevel), cfgSourceConfig, " compress-level is source config"); // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--recovery-option=a")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -371,7 +384,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--recovery-option=a")); strLstAdd(argList, strNew("--stanza=db")); strLstAdd(argList, strNew(TEST_COMMAND_RESTORE)); @@ -382,7 +395,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--db-include=abc")); strLstAdd(argList, strNew("--db-include=def")); strLstAdd(argList, strNew("--stanza=db")); @@ -397,7 +410,7 @@ testRun() // ------------------------------------------------------------------------------------------------------------------------- argList = strLstNew(); strLstAdd(argList, strNew(TEST_BACKREST_EXE)); - strLstAdd(argList, strNew("--db-path=/path/to/db")); + strLstAdd(argList, strNew("--pg1-path=/path/to/db")); strLstAdd(argList, strNew("--recovery-option=a=b")); strLstAdd(argList, strNew("--recovery-option=c=de=fg hi")); strLstAdd(argList, strNew("--stanza=db")); @@ -422,7 +435,7 @@ testRun() "recovery-option=hijk=l\n" "\n" "[db]\n" - "db1-path=/path/to/db\n" + "pg1-path=/path/to/db\n" ))); TEST_RESULT_VOID(configParse(strLstSize(argList), strLstPtr(argList)), TEST_COMMAND_RESTORE " command"); @@ -431,4 +444,63 @@ testRun() TEST_RESULT_STR(strPtr(varStr(kvGet(recoveryKv, varNewStr(strNew("f"))))), "g", "check recovery option"); TEST_RESULT_STR(strPtr(varStr(kvGet(recoveryKv, varNewStr(strNew("hijk"))))), "l", "check recovery option"); } + + // ----------------------------------------------------------------------------------------------------------------------------- + if (testBegin("deprecated option names")) + { + // Repository options + // ------------------------------------------------------------------------------------------------------------------------- + testOptionFind("hardlink", PARSE_DEPRECATE_FLAG | cfgOptRepoHardlink); + testOptionFind("no-hardlink", PARSE_DEPRECATE_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoHardlink); + + testOptionFind("backup-cmd", PARSE_DEPRECATE_FLAG | cfgOptRepoHostCmd); + testOptionFind("backup-config", PARSE_DEPRECATE_FLAG | cfgOptRepoHostConfig); + testOptionFind("backup-host", PARSE_DEPRECATE_FLAG | cfgOptRepoHost); + testOptionFind("backup-ssh-port", PARSE_DEPRECATE_FLAG | cfgOptRepoHostPort); + testOptionFind("backup-user", PARSE_DEPRECATE_FLAG | cfgOptRepoHostUser); + + testOptionFind("repo-cipher-pass", PARSE_DEPRECATE_FLAG | cfgOptRepoCipherPass); + testOptionFind("repo-cipher-type", PARSE_DEPRECATE_FLAG | cfgOptRepoCipherType); + testOptionFind("repo-path", PARSE_DEPRECATE_FLAG | cfgOptRepoPath); + testOptionFind("repo-type", PARSE_DEPRECATE_FLAG | cfgOptRepoType); + + testOptionFind("repo-s3-bucket", PARSE_DEPRECATE_FLAG | cfgOptRepoS3Bucket); + testOptionFind("repo-s3-ca-file", PARSE_DEPRECATE_FLAG | cfgOptRepoS3CaFile); + testOptionFind("repo-s3-ca-path", PARSE_DEPRECATE_FLAG | cfgOptRepoS3CaPath); + testOptionFind("repo-s3-endpoint", PARSE_DEPRECATE_FLAG | cfgOptRepoS3Endpoint); + testOptionFind("repo-s3-host", PARSE_DEPRECATE_FLAG | cfgOptRepoS3Host); + testOptionFind("repo-s3-key", PARSE_DEPRECATE_FLAG | cfgOptRepoS3Key); + testOptionFind("repo-s3-key-secret", PARSE_DEPRECATE_FLAG | cfgOptRepoS3KeySecret); + testOptionFind("repo-s3-region", PARSE_DEPRECATE_FLAG | cfgOptRepoS3Region); + testOptionFind("repo-s3-verify-ssl", PARSE_DEPRECATE_FLAG | cfgOptRepoS3VerifySsl); + testOptionFind("no-repo-s3-verify-ssl", PARSE_DEPRECATE_FLAG | PARSE_NEGATE_FLAG | cfgOptRepoS3VerifySsl); + + // PostreSQL options + // ------------------------------------------------------------------------------------------------------------------------- + testOptionFind("db-cmd", PARSE_DEPRECATE_FLAG | cfgOptPgHostCmd); + testOptionFind("db-config", PARSE_DEPRECATE_FLAG | cfgOptPgHostConfig); + testOptionFind("db-host", PARSE_DEPRECATE_FLAG | cfgOptPgHost); + testOptionFind("db-path", PARSE_DEPRECATE_FLAG | cfgOptPgPath); + testOptionFind("db-port", PARSE_DEPRECATE_FLAG | cfgOptPgPort); + testOptionFind("db-socket-path", PARSE_DEPRECATE_FLAG | cfgOptPgSocketPath); + testOptionFind("db-ssh-port", PARSE_DEPRECATE_FLAG | cfgOptPgHostPort); + testOptionFind("db-user", PARSE_DEPRECATE_FLAG | cfgOptPgHostUser); + + testOptionFind("no-db-user", 0); + + for (int optionIdx = 0; optionIdx < cfgDefOptionIndexTotal(cfgDefOptPgPath); optionIdx++) + { + testOptionFind(strPtr(strNewFmt("db%u-cmd", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgHostCmd + optionIdx)); + testOptionFind( + strPtr(strNewFmt("db%u-config", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgHostConfig + optionIdx)); + testOptionFind(strPtr(strNewFmt("db%u-host", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgHost + optionIdx)); + testOptionFind(strPtr(strNewFmt("db%u-path", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgPath + optionIdx)); + testOptionFind(strPtr(strNewFmt("db%u-port", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgPort + optionIdx)); + testOptionFind( + strPtr(strNewFmt("db%u-socket-path", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgSocketPath + optionIdx)); + testOptionFind( + strPtr(strNewFmt("db%u-ssh-port", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgHostPort + optionIdx)); + testOptionFind(strPtr(strNewFmt("db%u-user", optionIdx + 1)), PARSE_DEPRECATE_FLAG | (cfgOptPgHostUser + optionIdx)); + } + } } diff --git a/test/src/module/help/helpTest.c b/test/src/module/help/helpTest.c index c47eea73c..1c53613c0 100644 --- a/test/src/module/help/helpTest.c +++ b/test/src/module/help/helpTest.c @@ -141,16 +141,16 @@ testRun() "\n" "Repository Options:\n" "\n" - " --backup-cmd pgBackRest exe path on the backup host\n" - " --backup-config pgBackRest backup host configuration file\n" - " [default=/etc/pgbackrest.conf]\n" - " --backup-host backup host when operating remotely via SSH\n" - " [current=backup.example.net]\n" - " --backup-ssh-port backup server SSH port when backup-host is set\n" - " --backup-user backup host user when backup-host is set\n" - " [default=backrest]\n" " --repo-cipher-pass repository cipher passphrase\n" " --repo-cipher-type cipher used to encrypt the repository [default=none]\n" + " --repo-host repository host when operating remotely via SSH\n" + " [current=backup.example.net]\n" + " --repo-host-cmd pgBackRest exe path on the repository host\n" + " --repo-host-config pgBackRest repository host configuration file\n" + " [default=/etc/pgbackrest.conf]\n" + " --repo-host-port repository host port when repo-host is set\n" + " --repo-host-user repository host user when repo-host is set\n" + " [default=pgbackrest]\n" " --repo-path path where backups and archive are stored\n" " [default=/var/lib/pgbackrest]\n" " --repo-s3-bucket s3 repository bucket\n" @@ -167,9 +167,9 @@ testRun() "\n" "Stanza Options:\n" "\n" - " --db-host cluster host for operating remotely via SSH\n" - " --db-path cluster data directory\n" - " --db-ssh-port database server SSH port when db-host is set\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", helpVersion)); @@ -179,7 +179,7 @@ testRun() strLstAddZ(argList, "help"); strLstAddZ(argList, "archive-push"); strLstAddZ(argList, "--buffer-size=32768"); - strLstAddZ(argList, "--backup-host=backup.example.net"); + strLstAddZ(argList, "--repo1-host=backup.example.net"); TEST_RESULT_VOID(configParse(strLstSize(argList), strLstPtr(argList)), "help for archive-push command"); TEST_RESULT_STR(strPtr(helpRender()), commandHelp, " check text"); @@ -246,6 +246,30 @@ testRun() strLstAddZ(argList, "perl-bin"); TEST_RESULT_VOID(configParse(strLstSize(argList), strLstPtr(argList)), "help for archive-push command, perl-bin option"); TEST_RESULT_STR(strPtr(helpRender()), optionHelp, " check text"); + + // ------------------------------------------------------------------------------------------------------------------------- + optionHelp = strPtr(strNewFmt( + "%s - 'backup' command - 'repo-hardlink' option help\n" + "\n" + "Hardlink files between backups in the repository.\n" + "\n" + "Enable hard-linking of files in differential and incremental backups to their\n" + "full backups. This gives the appearance that each backup is a full backup at\n" + "the file-system level. Be careful, though, because modifying files that are\n" + "hard-linked can affect all the backups in the set.\n" + "\n" + "default: n\n" + "\n" + "deprecated name: hardlink\n", + helpVersion)); + + argList = strLstNew(); + strLstAddZ(argList, "/path/to/pgbackrest"); + strLstAddZ(argList, "help"); + strLstAddZ(argList, "backup"); + strLstAddZ(argList, "repo-hardlink"); + TEST_RESULT_VOID(configParse(strLstSize(argList), strLstPtr(argList)), "help for backup command, repo-hardlink option"); + TEST_RESULT_STR(strPtr(helpRender()), optionHelp, " check text"); } // ***************************************************************************************************************************** diff --git a/test/src/module/perl/execTest.c b/test/src/module/perl/execTest.c index 58a96798a..4cbf82916 100644 --- a/test/src/module/perl/execTest.c +++ b/test/src/module/perl/execTest.c @@ -92,7 +92,6 @@ testRun() cfgCommandParamSet(commandParamList); cfgOptionValidSet(cfgOptPerlOption, true); - // !!! WHY DO WE STILL NEED TO CREATE THE VAR KV EMPTY? StringList *perlList = strLstNew(); strLstAdd(perlList, strNew("-I.")); strLstAdd(perlList, strNew("-MDevel::Cover=-silent,1")); diff --git a/test/test.pl b/test/test.pl index 29c833fcc..ef6681f01 100755 --- a/test/test.pl +++ b/test/test.pl @@ -73,7 +73,7 @@ test.pl [options] --run execute only the specified test run --dry-run show only the tests that would be executed but don't execute them --no-cleanup don't cleaup after the last test is complete - useful for debugging - --db-version version of postgres to test (all, defaults to minimal) + --pg-version version of postgres to test (all, defaults to minimal) --log-force force overwrite of current test log files --no-lint disable static source code analysis --build-only compile the C library / packages and run tests only @@ -121,7 +121,7 @@ my $strTestPath; my $bVersion = false; my $bHelp = false; my $bQuiet = false; -my $strDbVersion = 'minimal'; +my $strPgVersion = 'minimal'; my $bLogForce = false; my $strVm; my $strVmHost = VM_HOST_DEFAULT; @@ -157,7 +157,7 @@ GetOptions ('q|quiet' => \$bQuiet, 'vm-max=s' => \$iVmMax, 'dry-run' => \$bDryRun, 'no-cleanup' => \$bNoCleanup, - 'db-version=s' => \$strDbVersion, + 'pg-version=s' => \$strPgVersion, 'log-force' => \$bLogForce, 'no-lint' => \$bNoLint, 'build-only' => \$bBuildOnly, @@ -216,7 +216,7 @@ eval $bSmart = true; $bNoPackage = true; $strVm = VM_EXPECT; - $strDbVersion = '9.6'; + $strPgVersion = '9.6'; $bLogForce = true; } @@ -431,7 +431,7 @@ eval { # Get the test list $oyTestRun = testListGet( - $strVm, \@stryModule, \@stryModuleTest, \@iyModuleTestRun, $strDbVersion, $bCoverageOnly, $bCOnly); + $strVm, \@stryModule, \@stryModuleTest, \@iyModuleTestRun, $strPgVersion, $bCoverageOnly, $bCOnly); # Search for any tests that are not C unit tests to determine if the C binary and lib need to be built for testing. If # all the tests are C unit tests then no builds are required. This saves a lot ot time. @@ -1095,8 +1095,8 @@ eval $strTestPath, # Path where the tests will run '/usr/bin/' . BACKREST_EXE, # Path to the backrest executable "${strBackRestBase}/bin/" . BACKREST_EXE, # Path to the backrest Perl helper - $strDbVersion ne 'minimal' ? $strPgSqlBin: undef, # Db bin path - $strDbVersion ne 'minimal' ? $strDbVersion: undef, # Db version + $strPgVersion ne 'minimal' ? $strPgSqlBin: undef, # Pg bin path + $strPgVersion ne 'minimal' ? $strPgVersion: undef, # Pg version $stryModule[0], $stryModuleTest[0], \@iyModuleTestRun, # Module info $bVmOut, $bDryRun, $bNoCleanup, $bLogForce, # Test options TEST_USER, BACKREST_USER, TEST_GROUP); # User/group info