From f210fe99c33fbab478fc3e75cc09bd5e5089446f Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 22 Jun 2015 13:11:07 -0400 Subject: [PATCH] Implemented issue #109: Move VERSION into source code. Also stopped replacing FORMAT number which explains the large number of test log changes. FORMAT should change very rarely and cause test log failures when it does. --- README.md | 2 + VERSION | 1 - doc/doc.xml | 3 ++ lib/BackRest/BackupInfo.pm | 2 - lib/BackRest/Config.pm | 18 +++---- lib/BackRest/Ini.pm | 21 +++++--- lib/BackRest/Protocol.pm | 3 +- lib/BackRest/Utility.pm | 47 +---------------- lib/BackRest/Version.pm | 32 ++++++++++++ test/lib/BackRestTest/BackupTest.pm | 7 +-- test/lib/BackRestTest/CommonTest.pm | 8 +-- test/log/backup-archive-get-001.log | 2 +- test/log/backup-archive-get-002.log | 2 +- test/log/backup-archive-get-003.log | 2 +- test/log/backup-archive-get-004.log | 2 +- test/log/backup-archive-get-005.log | 2 +- test/log/backup-archive-get-006.log | 2 +- test/log/backup-archive-get-007.log | 2 +- test/log/backup-archive-get-008.log | 2 +- test/log/backup-archive-push-001.log | 2 +- test/log/backup-archive-push-002.log | 2 +- test/log/backup-archive-push-003.log | 2 +- test/log/backup-archive-push-004.log | 2 +- test/log/backup-archive-push-005.log | 2 +- test/log/backup-archive-push-006.log | 2 +- test/log/backup-archive-push-007.log | 2 +- test/log/backup-archive-push-008.log | 2 +- test/log/backup-expire-001.log | 20 ++++---- test/log/backup-synthetic-001.log | 76 ++++++++++++++-------------- test/log/backup-synthetic-002.log | 76 ++++++++++++++-------------- test/log/backup-synthetic-003.log | 76 ++++++++++++++-------------- test/log/backup-synthetic-004.log | 76 ++++++++++++++-------------- test/log/backup-synthetic-005.log | 76 ++++++++++++++-------------- test/log/backup-synthetic-006.log | 76 ++++++++++++++-------------- test/log/backup-synthetic-007.log | 76 ++++++++++++++-------------- test/log/backup-synthetic-008.log | 76 ++++++++++++++-------------- test/test.pl | 27 ++++------ 37 files changed, 408 insertions(+), 423 deletions(-) delete mode 100644 VERSION create mode 100644 lib/BackRest/Version.pm diff --git a/README.md b/README.md index fc4d62f66..5493d718e 100644 --- a/README.md +++ b/README.md @@ -859,6 +859,8 @@ example: db-path=/data/db * Improved error message when backup is run without archive_command set and without --no-archive-check specified. Found by Eric Radman. +* Moved version number out of the VERSION file to Version.pm to better support packaging. Suggested by Michael Renner. + ### v0.75: New repository format, info command and experimental 9.5 support * IMPORTANT NOTE: This flag day release breaks compatibility with older versions of PgBackRest. The manifest format, on-disk structure, and the binary names have all changed. You must create a new repository to hold backups for this version of PgBackRest and keep your older repository for a time in case you need to do a restore. The `pg_backrest.conf` file has not changed but you'll need to change any references to `pg_backrest.pl` in cron (or elsewhere) to `pg_backrest` (without the `.pl` extension). diff --git a/VERSION b/VERSION deleted file mode 100644 index 885b05686..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.80 diff --git a/doc/doc.xml b/doc/doc.xml index 49da96fa6..be1cf3f60 100644 --- a/doc/doc.xml +++ b/doc/doc.xml @@ -818,6 +818,9 @@ Run a full backup on the db stanza. --type can Improved error message when backup is run without archive_command set and without --no-archive-check specified. Found by Eric Radman. + + Moved version number out of the VERSION file to Version.pm to better support packaging. Suggested by Michael Renner. + diff --git a/lib/BackRest/BackupInfo.pm b/lib/BackRest/BackupInfo.pm index 66a6b1f6d..a5cd90a15 100644 --- a/lib/BackRest/BackupInfo.pm +++ b/lib/BackRest/BackupInfo.pm @@ -116,8 +116,6 @@ sub new # Init object and store variables my $self = $class->SUPER::new($strBackupInfoFile, $bExists); - $self->set(INI_SECTION_BACKREST, INI_KEY_VERSION, undef, version_get()); - $self->{bExists} = $bExists; $self->{strBackupClusterPath} = $strBackupClusterPath; diff --git a/lib/BackRest/Config.pm b/lib/BackRest/Config.pm index 232923297..ddbb6364b 100644 --- a/lib/BackRest/Config.pm +++ b/lib/BackRest/Config.pm @@ -40,19 +40,19 @@ push @EXPORT, qw(DB BACKUP NONE); #################################################################################################################################### # Command constants - basic commands that are allowed in backrest #################################################################################################################################### -use constant CMD_ARCHIVE_GET => 'archive-get'; +use constant CMD_ARCHIVE_GET => 'archive-get'; push @EXPORT, qw(CMD_ARCHIVE_GET); -use constant CMD_ARCHIVE_PUSH => 'archive-push'; +use constant CMD_ARCHIVE_PUSH => 'archive-push'; push @EXPORT, qw(CMD_ARCHIVE_PUSH); -use constant CMD_BACKUP => 'backup'; +use constant CMD_BACKUP => 'backup'; push @EXPORT, qw(CMD_BACKUP); -use constant CMD_INFO => 'info'; +use constant CMD_INFO => 'info'; push @EXPORT, qw(CMD_INFO); -use constant CMD_REMOTE => 'remote'; +use constant CMD_REMOTE => 'remote'; push @EXPORT, qw(CMD_REMOTE); -use constant CMD_RESTORE => 'restore'; +use constant CMD_RESTORE => 'restore'; push @EXPORT, qw(CMD_RESTORE); -use constant CMD_EXPIRE => 'expire'; +use constant CMD_EXPIRE => 'expire'; push @EXPORT, qw(CMD_EXPIRE); #################################################################################################################################### @@ -1156,14 +1156,14 @@ sub configLoad if (!GetOptions(\%oOptionTest, %oOptionAllow)) { - syswrite(*STDOUT, "\npg_backrest " . version_get() . "\n\n"); + syswrite(*STDOUT, "\npg_backrest " . BACKREST_VERSION . "\n\n"); pod2usage(2); }; # Display version and exit if requested if (defined($oOptionTest{&OPTION_VERSION}) || defined($oOptionTest{&OPTION_HELP})) { - syswrite(*STDOUT, 'pg_backrest ' . version_get() . "\n"); + syswrite(*STDOUT, 'pg_backrest ' . BACKREST_VERSION . "\n"); if (!defined($oOptionTest{&OPTION_HELP})) { diff --git a/lib/BackRest/Ini.pm b/lib/BackRest/Ini.pm index 8372a3741..bc9447cde 100644 --- a/lib/BackRest/Ini.pm +++ b/lib/BackRest/Ini.pm @@ -17,6 +17,7 @@ use lib dirname($0); use BackRest::Exception; use BackRest::FileCommon; use BackRest::Utility; +use BackRest::Version; #################################################################################################################################### # Operation constants @@ -25,6 +26,14 @@ use constant OP_INI => 'Ini'; use constant OP_INI_SET => OP_INI . "->set"; +#################################################################################################################################### +# Version and Format Constants +#################################################################################################################################### +use constant BACKREST_VERSION => "$VERSION"; + our @EXPORT = qw(BACKREST_VERSION); +use constant BACKREST_FORMAT => "$FORMAT"; + push @EXPORT, qw(BACKREST_FORMAT); + #################################################################################################################################### # Boolean constants #################################################################################################################################### @@ -35,7 +44,7 @@ use constant INI_FALSE => JSON::PP: # Ini control constants #################################################################################################################################### use constant INI_SECTION_BACKREST => 'backrest'; - our @EXPORT = qw(INI_SECTION_BACKREST); + push @EXPORT, qw(INI_SECTION_BACKREST); use constant INI_KEY_CHECKSUM => 'backrest-checksum'; push @EXPORT, qw(INI_KEY_CHECKSUM); @@ -88,16 +97,16 @@ sub new # Make sure that the format is current, otherwise error my $iFormat = $self->get(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, false, 0); - if ($iFormat != FORMAT) + if ($iFormat != BACKREST_FORMAT) { - confess &log(ERROR, "format of ${strFileName} is ${iFormat} but " . FORMAT . ' is required by this version of ' . - 'PgBackRest.', ERROR_FORMAT); + confess &log(ERROR, "format of ${strFileName} is ${iFormat} but " . BACKREST_FORMAT . ' is required by this ' . + ' version of PgBackRest.', ERROR_FORMAT); } } else { - $self->setNumeric(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, FORMAT); - $self->set(INI_SECTION_BACKREST, INI_KEY_VERSION, undef, version_get()); + $self->setNumeric(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, BACKREST_FORMAT); + $self->set(INI_SECTION_BACKREST, INI_KEY_VERSION, undef, BACKREST_VERSION); } return $self; diff --git a/lib/BackRest/Protocol.pm b/lib/BackRest/Protocol.pm index 38c78b6b9..588f97f65 100644 --- a/lib/BackRest/Protocol.pm +++ b/lib/BackRest/Protocol.pm @@ -17,6 +17,7 @@ use Scalar::Util qw(blessed); use lib dirname($0) . '/../lib'; use BackRest::Config; use BackRest::Exception; +use BackRest::Ini; use BackRest::Utility; #################################################################################################################################### @@ -56,7 +57,7 @@ sub new if (defined($strName)) { $self->{strName} = $strName; - $self->{strGreeting} = 'PG_BACKREST_' . uc($strName) . ' ' . version_get(); + $self->{strGreeting} = 'PG_BACKREST_' . uc($strName) . ' ' . BACKREST_VERSION; } $self->{bBackend} = $bBackend; diff --git a/lib/BackRest/Utility.pm b/lib/BackRest/Utility.pm index 16b163941..84758173f 100644 --- a/lib/BackRest/Utility.pm +++ b/lib/BackRest/Utility.pm @@ -26,7 +26,7 @@ our @EXPORT = qw(version_get hsleep wait_remainder timestamp_string_get timestamp_file_string_get TRACE DEBUG ERROR ASSERT WARN INFO OFF true false - TEST TEST_ENCLOSE TEST_MANIFEST_BUILD TEST_BACKUP_RESUME TEST_BACKUP_NORESUME FORMAT); + TEST TEST_ENCLOSE TEST_MANIFEST_BUILD TEST_BACKUP_RESUME TEST_BACKUP_NORESUME); # Global constants use constant @@ -62,16 +62,6 @@ $oLogLevelRank{ERROR}{rank} = 2; $oLogLevelRank{ASSERT}{rank} = 1; $oLogLevelRank{OFF}{rank} = 0; -# Construct the version file name -my $strVersionFile = abs_path(dirname($0) . '/../VERSION'); - -#################################################################################################################################### -# FORMAT Constant -# -# Identified the format of the manifest and file structure. The format is used to determine compatability between versions. -#################################################################################################################################### -use constant FORMAT => 4; - #################################################################################################################################### # TEST Constants and Variables #################################################################################################################################### @@ -89,41 +79,6 @@ use constant my $bTest = false; my $fTestDelay; -#################################################################################################################################### -# VERSION_GET -#################################################################################################################################### -my $strVersion; - -sub version_get -{ - my $hVersion; - - # If version is already stored then return it (should never change during execution) - if (defined($strVersion)) - { - return $strVersion; - } - - # Open the file - if (!open($hVersion, '<', $strVersionFile)) - { - confess &log(ASSERT, "unable to open VERSION file: ${strVersionFile}"); - } - - # Read version and trim - if (!($strVersion = readline($hVersion))) - { - confess &log(ASSERT, "unable to read VERSION file: ${strVersionFile}"); - } - - $strVersion = trim($strVersion); - - # Close file - close($hVersion); - - return $strVersion; -} - #################################################################################################################################### # WAIT_REMAINDER - Wait the remainder of the current second #################################################################################################################################### diff --git a/lib/BackRest/Version.pm b/lib/BackRest/Version.pm new file mode 100644 index 000000000..341f8a9ed --- /dev/null +++ b/lib/BackRest/Version.pm @@ -0,0 +1,32 @@ +#################################################################################################################################### +# VERSION MODULE +# +# Contains BackRest version and format numbers. +#################################################################################################################################### +package BackRest::Version; + +use strict; +use warnings FATAL => qw(all); + +use Exporter qw(import); + +# BackRest Version Number +# +# Defines the current version of the BackRest executable. The version number is used to track features but does not affect what +# repositories or manifests can be read - that's the job of the format number. +#----------------------------------------------------------------------------------------------------------------------------------- +our # 'our' keyword is on a separate line to make the ExtUtils::MakeMaker parser happy. +$VERSION = '0.80'; + +our @EXPORT = qw($VERSION); + +# Format Format Number +# +# Defines format for info and manifest files as well as on-disk structure. If this number changes then the repository will be +# invalid unless migration functions are written. +#----------------------------------------------------------------------------------------------------------------------------------- +our $FORMAT = 4; + +push @EXPORT, qw($FORMAT); + +1; diff --git a/test/lib/BackRestTest/BackupTest.pm b/test/lib/BackRestTest/BackupTest.pm index 46e1cd020..f5cd07bfa 100755 --- a/test/lib/BackRestTest/BackupTest.pm +++ b/test/lib/BackRestTest/BackupTest.pm @@ -1072,7 +1072,7 @@ sub BackRestTestBackup_BackupCompare $oActualManifest{&MANIFEST_SECTION_BACKUP}{&MANIFEST_KEY_TIMESTAMP_COPY_START}; ${$oExpectedManifestRef}{&INI_SECTION_BACKREST}{&INI_KEY_CHECKSUM} = $oActualManifest{&INI_SECTION_BACKREST}{&INI_KEY_CHECKSUM}; - ${$oExpectedManifestRef}{&INI_SECTION_BACKREST}{&INI_KEY_FORMAT} = FORMAT + 0; + ${$oExpectedManifestRef}{&INI_SECTION_BACKREST}{&INI_KEY_FORMAT} = BACKREST_FORMAT + 0; my $strTestPath = BackRestTestCommon_TestPathGet(); @@ -2158,7 +2158,7 @@ sub BackRestTestBackup_Test # Build the manifest my %oManifest; - $oManifest{&INI_SECTION_BACKREST}{&INI_KEY_VERSION} = version_get(); + $oManifest{&INI_SECTION_BACKREST}{&INI_KEY_VERSION} = BACKREST_VERSION; $oManifest{&MANIFEST_SECTION_BACKUP_OPTION}{&MANIFEST_KEY_ARCHIVE_CHECK} = JSON::PP::true; $oManifest{&MANIFEST_SECTION_BACKUP_OPTION}{&MANIFEST_KEY_ARCHIVE_COPY} = JSON::PP::true; $oManifest{&MANIFEST_SECTION_BACKUP_OPTION}{&MANIFEST_KEY_COMPRESS} = $bCompress ? JSON::PP::true : JSON::PP::false; @@ -2418,7 +2418,8 @@ sub BackRestTestBackup_Test undef, undef, undef, undef, undef, undef, 'fail on mismatch format', ERROR_FORMAT); - BackRestTestBackup_ManifestMunge($oFile, $bRemote, $strBackup, INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, FORMAT); + BackRestTestBackup_ManifestMunge($oFile, $bRemote, $strBackup, INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, + BACKREST_FORMAT); # Remap the base path my %oRemapHash; diff --git a/test/lib/BackRestTest/CommonTest.pm b/test/lib/BackRestTest/CommonTest.pm index 26fb8ec5d..30605f17a 100755 --- a/test/lib/BackRestTest/CommonTest.pm +++ b/test/lib/BackRestTest/CommonTest.pm @@ -445,18 +445,12 @@ sub BackRestTestCommon_ExecuteRegAll $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'USER', 'user = [^ \n,\[\]]+', '[^ \n,\[\]]+$'); $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'USER', 'user"[ ]{0,1}:[ ]{0,1}"[^"]+', '[^"]+$'); - $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'VERSION', 'version[ ]{0,1}=[ ]{0,1}\"' . version_get(), version_get . '$'); - $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'VERSION', '"version"[ ]{0,1}:[ ]{0,1}\"' . version_get(), version_get . '$'); - - $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'FORMAT', 'format=' . FORMAT, FORMAT . '$'); - $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'FORMAT', '"format"[ ]{0,1}:[ ]{0,1}' . FORMAT, FORMAT . '$'); - $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'PORT', '--port=[0-9]+', '[0-9]+$'); my $strTimestampRegExp = "[0-9]{4}-[0-1][0-9]-[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]"; $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'VERSION', - "version[\"]{0,1}[ ]{0,1}[\:\=)]{1}[ ]{0,1}[\"]{0,1}" . version_get(), version_get() . '$'); + "version[\"]{0,1}[ ]{0,1}[\:\=)]{1}[ ]{0,1}[\"]{0,1}" . BACKREST_VERSION, BACKREST_VERSION . '$'); $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'TIMESTAMP', "timestamp-[a-z-]+[\"]{0,1}[ ]{0,1}[\:\=)]{1}[ ]{0,1}[\"]{0,1}[0-9]+", '[0-9]+$', false); $strLine = BackRestTestCommon_ExecuteRegExp($strLine, 'TIMESTAMP', diff --git a/test/log/backup-archive-get-001.log b/test/log/backup-archive-get-001.log index 5255749dc..4fd21b543 100644 --- a/test/log/backup-archive-get-001.log +++ b/test/log/backup-archive-get-001.log @@ -14,7 +14,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-get-002.log b/test/log/backup-archive-get-002.log index b63e1d589..6469c8384 100644 --- a/test/log/backup-archive-get-002.log +++ b/test/log/backup-archive-get-002.log @@ -14,7 +14,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-get-003.log b/test/log/backup-archive-get-003.log index b057de3dd..e018969dd 100644 --- a/test/log/backup-archive-get-003.log +++ b/test/log/backup-archive-get-003.log @@ -14,7 +14,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-get-004.log b/test/log/backup-archive-get-004.log index 687c0f520..5f1222d70 100644 --- a/test/log/backup-archive-get-004.log +++ b/test/log/backup-archive-get-004.log @@ -14,7 +14,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-get-005.log b/test/log/backup-archive-get-005.log index 8e5b80483..a9de17476 100644 --- a/test/log/backup-archive-get-005.log +++ b/test/log/backup-archive-get-005.log @@ -15,7 +15,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-get-006.log b/test/log/backup-archive-get-006.log index d6562b9d5..3de467877 100644 --- a/test/log/backup-archive-get-006.log +++ b/test/log/backup-archive-get-006.log @@ -15,7 +15,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-get-007.log b/test/log/backup-archive-get-007.log index 7291c6a16..5e06f8553 100644 --- a/test/log/backup-archive-get-007.log +++ b/test/log/backup-archive-get-007.log @@ -15,7 +15,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-get-008.log b/test/log/backup-archive-get-008.log index 405d85515..a64dfd95d 100644 --- a/test/log/backup-archive-get-008.log +++ b/test/log/backup-archive-get-008.log @@ -15,7 +15,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-001.log b/test/log/backup-archive-push-001.log index a13bd5a69..8e93fb944 100644 --- a/test/log/backup-archive-push-001.log +++ b/test/log/backup-archive-push-001.log @@ -237,7 +237,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-002.log b/test/log/backup-archive-push-002.log index 5996c35e0..28962a2ad 100644 --- a/test/log/backup-archive-push-002.log +++ b/test/log/backup-archive-push-002.log @@ -433,7 +433,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-003.log b/test/log/backup-archive-push-003.log index a63f1935b..7b8e1f0d6 100644 --- a/test/log/backup-archive-push-003.log +++ b/test/log/backup-archive-push-003.log @@ -237,7 +237,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-004.log b/test/log/backup-archive-push-004.log index 0052336cf..38999a994 100644 --- a/test/log/backup-archive-push-004.log +++ b/test/log/backup-archive-push-004.log @@ -433,7 +433,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-005.log b/test/log/backup-archive-push-005.log index 5343ca585..19e92e952 100644 --- a/test/log/backup-archive-push-005.log +++ b/test/log/backup-archive-push-005.log @@ -209,7 +209,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-006.log b/test/log/backup-archive-push-006.log index 01d853dc8..dafaecd2e 100644 --- a/test/log/backup-archive-push-006.log +++ b/test/log/backup-archive-push-006.log @@ -406,7 +406,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-007.log b/test/log/backup-archive-push-007.log index f5a0820f4..02f03eb34 100644 --- a/test/log/backup-archive-push-007.log +++ b/test/log/backup-archive-push-007.log @@ -209,7 +209,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-archive-push-008.log b/test/log/backup-archive-push-008.log index cced4ddc4..8042a4adb 100644 --- a/test/log/backup-archive-push-008.log +++ b/test/log/backup-archive-push-008.log @@ -406,7 +406,7 @@ DEBUG: safe exit called, terminating threads ----------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [db] diff --git a/test/log/backup-expire-001.log b/test/log/backup-expire-001.log index d409d8b18..ed2e14a00 100644 --- a/test/log/backup-expire-001.log +++ b/test/log/backup-expire-001.log @@ -5,7 +5,7 @@ run 001 - local --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -67,7 +67,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -139,7 +139,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -201,7 +201,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -283,7 +283,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -371,7 +371,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -453,7 +453,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -528,7 +528,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -587,7 +587,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -649,7 +649,7 @@ DEBUG: safe exit called, terminating threads --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] diff --git a/test/log/backup-synthetic-001.log b/test/log/backup-synthetic-001.log index 2393ffcb8..8ffdc86df 100644 --- a/test/log/backup-synthetic-001.log +++ b/test/log/backup-synthetic-001.log @@ -80,7 +80,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -125,7 +125,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -173,7 +173,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -292,7 +292,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -337,7 +337,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -550,7 +550,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -605,7 +605,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -716,7 +716,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -779,7 +779,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -893,7 +893,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -956,7 +956,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1071,7 +1071,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1134,7 +1134,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1182,7 +1182,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1193,7 +1193,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1352,7 +1352,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1409,7 +1409,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1514,7 +1514,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1571,7 +1571,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1690,7 +1690,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1747,7 +1747,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1851,7 +1851,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1908,7 +1908,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2025,7 +2025,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2080,7 +2080,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2206,7 +2206,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2261,7 +2261,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2376,7 +2376,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2433,7 +2433,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2565,7 +2565,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2594,7 +2594,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2625,7 +2625,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2657,7 +2657,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2690,7 +2690,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2721,7 +2721,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2753,7 +2753,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2784,7 +2784,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2813,7 +2813,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/log/backup-synthetic-002.log b/test/log/backup-synthetic-002.log index f1fee09cd..dc9e822e2 100644 --- a/test/log/backup-synthetic-002.log +++ b/test/log/backup-synthetic-002.log @@ -81,7 +81,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -126,7 +126,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -174,7 +174,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -294,7 +294,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -339,7 +339,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -564,7 +564,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -619,7 +619,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -750,7 +750,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -813,7 +813,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -941,7 +941,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1004,7 +1004,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1133,7 +1133,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1196,7 +1196,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1244,7 +1244,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1255,7 +1255,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1428,7 +1428,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1485,7 +1485,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1608,7 +1608,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1665,7 +1665,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1792,7 +1792,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1849,7 +1849,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1975,7 +1975,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2032,7 +2032,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2159,7 +2159,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2214,7 +2214,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2341,7 +2341,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2396,7 +2396,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2529,7 +2529,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2586,7 +2586,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2718,7 +2718,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2747,7 +2747,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2778,7 +2778,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2810,7 +2810,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2843,7 +2843,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2874,7 +2874,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2906,7 +2906,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2937,7 +2937,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2966,7 +2966,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/log/backup-synthetic-003.log b/test/log/backup-synthetic-003.log index f8d2923e1..9d5ca49d9 100644 --- a/test/log/backup-synthetic-003.log +++ b/test/log/backup-synthetic-003.log @@ -79,7 +79,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -124,7 +124,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -172,7 +172,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -294,7 +294,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -339,7 +339,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -551,7 +551,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -606,7 +606,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -717,7 +717,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -780,7 +780,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -893,7 +893,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -956,7 +956,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1070,7 +1070,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1133,7 +1133,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1181,7 +1181,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1192,7 +1192,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1350,7 +1350,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1407,7 +1407,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1511,7 +1511,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1568,7 +1568,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1686,7 +1686,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1743,7 +1743,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1846,7 +1846,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1903,7 +1903,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2019,7 +2019,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2074,7 +2074,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2199,7 +2199,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2254,7 +2254,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2368,7 +2368,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2425,7 +2425,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2557,7 +2557,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2586,7 +2586,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2617,7 +2617,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2649,7 +2649,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2682,7 +2682,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2713,7 +2713,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2745,7 +2745,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2776,7 +2776,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2805,7 +2805,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/log/backup-synthetic-004.log b/test/log/backup-synthetic-004.log index d9697ecec..be0fab6bf 100644 --- a/test/log/backup-synthetic-004.log +++ b/test/log/backup-synthetic-004.log @@ -80,7 +80,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -125,7 +125,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -173,7 +173,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -296,7 +296,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -341,7 +341,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -565,7 +565,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -620,7 +620,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -751,7 +751,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -814,7 +814,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -941,7 +941,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1004,7 +1004,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1132,7 +1132,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1195,7 +1195,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1243,7 +1243,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1254,7 +1254,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: local backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1426,7 +1426,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1483,7 +1483,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1605,7 +1605,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1662,7 +1662,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1788,7 +1788,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1845,7 +1845,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1970,7 +1970,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2027,7 +2027,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2153,7 +2153,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2208,7 +2208,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2334,7 +2334,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2389,7 +2389,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2521,7 +2521,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2578,7 +2578,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2710,7 +2710,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2739,7 +2739,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2770,7 +2770,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2802,7 +2802,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2835,7 +2835,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2866,7 +2866,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2898,7 +2898,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2929,7 +2929,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2958,7 +2958,7 @@ DEBUG: BackupInfo->new: backupClusterPath = [TEST_PATH]/backrest/backup/db_e "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/log/backup-synthetic-005.log b/test/log/backup-synthetic-005.log index 408d9384e..7b64c893a 100644 --- a/test/log/backup-synthetic-005.log +++ b/test/log/backup-synthetic-005.log @@ -112,7 +112,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -157,7 +157,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -205,7 +205,7 @@ DEBUG: Info->listStanza: stanza = db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -356,7 +356,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -401,7 +401,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -656,7 +656,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -711,7 +711,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -854,7 +854,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -917,7 +917,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1063,7 +1063,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1126,7 +1126,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1273,7 +1273,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1336,7 +1336,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1388,7 +1388,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1401,7 +1401,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1589,7 +1589,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1646,7 +1646,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1778,7 +1778,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1835,7 +1835,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1981,7 +1981,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2038,7 +2038,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2169,7 +2169,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2226,7 +2226,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2370,7 +2370,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2425,7 +2425,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2578,7 +2578,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2633,7 +2633,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2775,7 +2775,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2832,7 +2832,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2964,7 +2964,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2993,7 +2993,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3024,7 +3024,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3056,7 +3056,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3089,7 +3089,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3120,7 +3120,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3152,7 +3152,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3183,7 +3183,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3212,7 +3212,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/log/backup-synthetic-006.log b/test/log/backup-synthetic-006.log index 8fa4fa3f6..01299c2fe 100644 --- a/test/log/backup-synthetic-006.log +++ b/test/log/backup-synthetic-006.log @@ -113,7 +113,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -158,7 +158,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -206,7 +206,7 @@ DEBUG: Info->listStanza: stanza = db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -358,7 +358,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -403,7 +403,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -670,7 +670,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -725,7 +725,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -888,7 +888,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -951,7 +951,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1111,7 +1111,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1174,7 +1174,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1335,7 +1335,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1398,7 +1398,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1450,7 +1450,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1463,7 +1463,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1665,7 +1665,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1722,7 +1722,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1872,7 +1872,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1929,7 +1929,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2083,7 +2083,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2140,7 +2140,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2293,7 +2293,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2350,7 +2350,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2504,7 +2504,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2559,7 +2559,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2713,7 +2713,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2768,7 +2768,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2928,7 +2928,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2985,7 +2985,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -3117,7 +3117,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3146,7 +3146,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3177,7 +3177,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3209,7 +3209,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3242,7 +3242,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3273,7 +3273,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3305,7 +3305,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3336,7 +3336,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3365,7 +3365,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/log/backup-synthetic-007.log b/test/log/backup-synthetic-007.log index db4f7e61b..af8d63fdb 100644 --- a/test/log/backup-synthetic-007.log +++ b/test/log/backup-synthetic-007.log @@ -110,7 +110,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -155,7 +155,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -203,7 +203,7 @@ DEBUG: Info->listStanza: stanza = db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -356,7 +356,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -401,7 +401,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -654,7 +654,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -709,7 +709,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -851,7 +851,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -914,7 +914,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1058,7 +1058,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1121,7 +1121,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1266,7 +1266,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1329,7 +1329,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1381,7 +1381,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1394,7 +1394,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1580,7 +1580,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1637,7 +1637,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1767,7 +1767,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1824,7 +1824,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1968,7 +1968,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2025,7 +2025,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2154,7 +2154,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2211,7 +2211,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2353,7 +2353,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2408,7 +2408,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2559,7 +2559,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2614,7 +2614,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2754,7 +2754,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2811,7 +2811,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2943,7 +2943,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -2972,7 +2972,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3003,7 +3003,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3035,7 +3035,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3068,7 +3068,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3099,7 +3099,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3131,7 +3131,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3162,7 +3162,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3191,7 +3191,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/log/backup-synthetic-008.log b/test/log/backup-synthetic-008.log index 57538b800..9d08fd0bd 100644 --- a/test/log/backup-synthetic-008.log +++ b/test/log/backup-synthetic-008.log @@ -111,7 +111,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -156,7 +156,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -204,7 +204,7 @@ DEBUG: Info->listStanza: stanza = db "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -358,7 +358,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -403,7 +403,7 @@ pg_tblspc={"group":"[GROUP-1]","mode":"0700","user":"[USER-1]"} --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -668,7 +668,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -723,7 +723,7 @@ tablespace1.txt={"checksum":"d85de07d6421d90aa9191c11c889bfde43680f0f","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -885,7 +885,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -948,7 +948,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1106,7 +1106,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1169,7 +1169,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1328,7 +1328,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1391,7 +1391,7 @@ tablespace2.txt={"checksum":"dc7f76e43c46101b47acc55ae4d593a9e6983578","group":" --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1443,7 +1443,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', expect exit 104 (fail on mismatch format) @@ -1456,7 +1456,7 @@ DEBUG: File->exists: db:absolute:[TEST_PATH]/db/common/postmaster.pid DEBUG: File->exists: backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2] DEBUG: File->copy: remote backup:cluster:[TEST_PATH]/backrest/backup/db/[BACKUP-DIFF-2]/backup.manifest to local db:absolute:[TEST_PATH]/db/common/backup.manifest, source_compressed = false, destination_compress = false, ignore_missing_source = false, destination_path_create = false, modification_time = [undef], mode = [undef], user = [undef], group = [undef] DEBUG: File->move: absolute:[TEST_PATH]/db/common/backup.manifest.backrest.tmp to absolute:[TEST_PATH]/db/common/backup.manifest, destination_path_create = false -ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. +ERROR: [104]: format of [TEST_PATH]/db/common/backup.manifest is 0 but 4 is required by this version of PgBackRest. DEBUG: safe exit called, terminating threads restore, backup '[BACKUP-DIFF-2]', remap (remap all paths) @@ -1656,7 +1656,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1713,7 +1713,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -1861,7 +1861,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -1918,7 +1918,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2070,7 +2070,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2127,7 +2127,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2278,7 +2278,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2335,7 +2335,7 @@ tablespace2b.txt={"checksum":"e324463005236d83e6e54795dbddd20a74533bf3","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2487,7 +2487,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2542,7 +2542,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2694,7 +2694,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2749,7 +2749,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -2907,7 +2907,7 @@ log-level-file=trace ----------------------------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup] @@ -2964,7 +2964,7 @@ tablespace2c.txt={"checksum":"dfcb8679956b734706cf87259d50c88f83e80e66","group": --------------------------------------------------------------- [backrest] backrest-checksum="[CHECKSUM]" -backrest-format=[FORMAT-1] +backrest-format=4 backrest-version="[VERSION-1]" [backup:current] @@ -3096,7 +3096,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3125,7 +3125,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3156,7 +3156,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3188,7 +3188,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3221,7 +3221,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3252,7 +3252,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3284,7 +3284,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3315,7 +3315,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { @@ -3344,7 +3344,7 @@ DEBUG: Info->listStanza "stop" : null }, "backrest" : { - "format" : [FORMAT-1], + "format" : 4, "version" : "[VERSION-1]" }, "database" : { diff --git a/test/test.pl b/test/test.pl index 97db24518..5c1cb05d1 100755 --- a/test/test.pl +++ b/test/test.pl @@ -21,6 +21,7 @@ use Scalar::Util qw(blessed); use lib dirname($0) . '/../lib'; use BackRest::Db; +use BackRest::Ini; use BackRest::Utility; use lib dirname($0) . '/lib'; @@ -199,7 +200,6 @@ if ($iThreadMax < 1 || $iThreadMax > 32) my $hReadMe; my $strLine; my $bMatch = false; -my $strVersion = version_get(); if (!open($hReadMe, '<', dirname($0) . '/../README.md')) { @@ -210,35 +210,26 @@ while ($strLine = readline($hReadMe)) { if ($strLine =~ /^\#\#\# v/) { - $bMatch = substr($strLine, 5, length($strVersion)) eq $strVersion; + $bMatch = substr($strLine, 5, length(BACKREST_VERSION)) eq BACKREST_VERSION; last; } } if (!$bMatch) { - confess "unable to find version ${strVersion} as last revision in README.md"; + confess 'unable to find version ' . BACKREST_VERSION . ' as last revision in README.md'; } #################################################################################################################################### # Clean whitespace only if test.pl is being run from the test directory in the backrest repo #################################################################################################################################### -my $hVersion; - -if (-e './test.pl' && -e '../bin/pg_backrest' && open($hVersion, '<', '../VERSION')) +if (-e './test.pl' && -e '../bin/pg_backrest') { - my $strTestVersion = readline($hVersion); - - if (defined($strTestVersion) && $strVersion eq trim($strTestVersion)) - { - BackRestTestCommon_Execute( - "find .. -type f -not -path \"../.git/*\" -not -path \"*.DS_Store\" -not -path \"../test/test/*\" " . - "-not -path \"../test/data/*\" " . - "-exec sh -c 'for i;do echo \"\$i\" && sed 's/[[:space:]]*\$//' \"\$i\">/tmp/.\$\$ && cat /tmp/.\$\$ " . - "> \"\$i\";done' arg0 {} + > /dev/null", false, true); - } - - close($hVersion); + BackRestTestCommon_Execute( + "find .. -type f -not -path \"../.git/*\" -not -path \"*.DS_Store\" -not -path \"../test/test/*\" " . + "-not -path \"../test/data/*\" " . + "-exec sh -c 'for i;do echo \"\$i\" && sed 's/[[:space:]]*\$//' \"\$i\">/tmp/.\$\$ && cat /tmp/.\$\$ " . + "> \"\$i\";done' arg0 {} + > /dev/null", false, true); } ####################################################################################################################################