From 77b01e980fc82d81585531bd688d8a32bed759d5 Mon Sep 17 00:00:00 2001 From: David Steele Date: Sat, 14 May 2016 10:36:35 -0400 Subject: [PATCH] Make the initial capital for hints consistent. Some hints started with a capital letter and others did not. Make them all lower case for consistency. --- lib/pgBackRest/Archive.pm | 2 +- lib/pgBackRest/ArchiveInfo.pm | 4 ++-- lib/pgBackRest/Backup.pm | 2 +- lib/pgBackRest/BackupInfo.pm | 8 ++++---- lib/pgBackRest/Config/Config.pm | 2 +- lib/pgBackRest/Db.pm | 2 +- test/expect/backup-archive-get-001.log | 4 ++-- test/expect/backup-archive-get-002.log | 4 ++-- test/expect/backup-archive-get-003.log | 4 ++-- test/expect/backup-archive-get-004.log | 4 ++-- test/expect/backup-archive-get-005.log | 4 ++-- test/expect/backup-archive-get-006.log | 4 ++-- test/expect/backup-archive-get-007.log | 4 ++-- test/expect/backup-archive-get-008.log | 4 ++-- test/expect/backup-synthetic-001.log | 4 ++-- test/expect/backup-synthetic-002.log | 4 ++-- test/expect/backup-synthetic-003.log | 4 ++-- test/expect/backup-synthetic-004.log | 4 ++-- test/expect/backup-synthetic-005.log | 4 ++-- test/expect/backup-synthetic-006.log | 4 ++-- test/expect/backup-synthetic-007.log | 4 ++-- test/expect/backup-synthetic-008.log | 4 ++-- test/lib/pgBackRestTest/ConfigTest.pm | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lib/pgBackRest/Archive.pm b/lib/pgBackRest/Archive.pm index f80b3b7f0..851b9d0ad 100644 --- a/lib/pgBackRest/Archive.pm +++ b/lib/pgBackRest/Archive.pm @@ -290,7 +290,7 @@ sub walInfo if (!defined($strDbVersion)) { confess &log(ERROR, "unexpected WAL magic 0x" . sprintf("%X", $iMagic) . "\n" . - 'HINT: Is this version of PostgreSQL supported?', + 'HINT: is this version of PostgreSQL supported?', ERROR_VERSION_NOT_SUPPORTED); } diff --git a/lib/pgBackRest/ArchiveInfo.pm b/lib/pgBackRest/ArchiveInfo.pm index 419cfbd27..0fda2652b 100644 --- a/lib/pgBackRest/ArchiveInfo.pm +++ b/lib/pgBackRest/ArchiveInfo.pm @@ -79,8 +79,8 @@ sub new if (!$bExists && $bRequired) { confess &log(ERROR, ARCHIVE_INFO_FILE . " does not exist but is required to get WAL segments\n" . - "HINT: Is archive_command configured in postgresql.conf?\n" . - "HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving" . + "HINT: is archive_command configured in postgresql.conf?\n" . + "HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving" . " scheme.", ERROR_FILE_MISSING); } diff --git a/lib/pgBackRest/Backup.pm b/lib/pgBackRest/Backup.pm index c1d4602aa..f5213d18e 100644 --- a/lib/pgBackRest/Backup.pm +++ b/lib/pgBackRest/Backup.pm @@ -381,7 +381,7 @@ sub processManifest if (!defined($oFileCopyMap{&MANIFEST_TARGET_PGDATA}{&MANIFEST_FILE_PGCONTROL}) && optionGet(OPTION_ONLINE)) { confess &log(ERROR, DB_FILE_PGCONTROL . " must be present in all online backups\n" . - 'HINT: Is something wrong with the clock or filesystem timestamps?', ERROR_FILE_MISSING); + 'HINT: is something wrong with the clock or filesystem timestamps?', ERROR_FILE_MISSING); } # If there are no files to backup then we'll exit with a warning unless in test mode. The other way this could happen is if diff --git a/lib/pgBackRest/BackupInfo.pm b/lib/pgBackRest/BackupInfo.pm index 80095c02b..414469b08 100644 --- a/lib/pgBackRest/BackupInfo.pm +++ b/lib/pgBackRest/BackupInfo.pm @@ -263,8 +263,8 @@ sub check { confess &log(ERROR, "database version = ${strDbVersion}, system-id ${ullDbSysId} does not match backup version = " . $self->get(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_DB_VERSION) . ", system-id = " . - $self->get(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_SYSTEM_ID) . - "\nHINT: are you backing up to the correct stanza?", ERROR_BACKUP_MISMATCH); + $self->get(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_SYSTEM_ID) . "\n" . + "HINT: is this the correct stanza?", ERROR_BACKUP_MISMATCH); } if (!$self->test(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_CATALOG, undef, $iCatalogVersion) || @@ -273,8 +273,8 @@ sub check confess &log(ERROR, "database control-version = ${iControlVersion}, catalog-version ${iCatalogVersion}" . " does not match backup control-version = " . $self->get(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_CONTROL) . ", catalog-version = " . - $self->get(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_CATALOG) . - "\nHINT: this may be a symptom of database or repository corruption!", ERROR_BACKUP_MISMATCH); + $self->get(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_CATALOG) . "\n" . + "HINT: this may be a symptom of database or repository corruption!", ERROR_BACKUP_MISMATCH); } $iDbHistoryId = $self->numericGet(INFO_BACKUP_SECTION_DB, INFO_BACKUP_KEY_HISTORY_ID); diff --git a/lib/pgBackRest/Config/Config.pm b/lib/pgBackRest/Config/Config.pm index e0f55e81f..f7fa39aa5 100644 --- a/lib/pgBackRest/Config/Config.pm +++ b/lib/pgBackRest/Config/Config.pm @@ -1456,7 +1456,7 @@ my %oOptionRule = { &OPTION_RULE_SECTION => CONFIG_SECTION_STANZA, &OPTION_RULE_TYPE => OPTION_TYPE_STRING, - &OPTION_RULE_HINT => "Does this stanza exist?", + &OPTION_RULE_HINT => "does this stanza exist?", &OPTION_RULE_COMMAND => { &CMD_ARCHIVE_GET => diff --git a/lib/pgBackRest/Db.pm b/lib/pgBackRest/Db.pm index f51342afe..a55d5727b 100644 --- a/lib/pgBackRest/Db.pm +++ b/lib/pgBackRest/Db.pm @@ -538,7 +538,7 @@ sub info ERROR, 'unexpected control version = ' . $self->{info}{$strDbPath}{iControlVersion} . ' and catalog version = ' . $self->{info}{$strDbPath}{iCatalogVersion} . "\n" . - 'HINT: Is this version of PostgreSQL supported?', + 'HINT: is this version of PostgreSQL supported?', ERROR_VERSION_NOT_SUPPORTED); } } diff --git a/test/expect/backup-archive-get-001.log b/test/expect/backup-archive-get-001.log index 6adec1c03..b3b8645e6 100644 --- a/test/expect/backup-archive-get-001.log +++ b/test/expect/backup-archive-get-001.log @@ -9,8 +9,8 @@ run 001 - rmt 0, cmp 0, exists 0 DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = none, strStanza = db DEBUG: ArchiveInfo->new(): bRequired = true, strArchiveClusterPath = [TEST_PATH]/backrest/archive/db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-archive-get-002.log b/test/expect/backup-archive-get-002.log index 24158cf46..0de41aaa2 100644 --- a/test/expect/backup-archive-get-002.log +++ b/test/expect/backup-archive-get-002.log @@ -9,8 +9,8 @@ run 002 - rmt 0, cmp 0, exists 1 DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = none, strStanza = db DEBUG: ArchiveInfo->new(): bRequired = true, strArchiveClusterPath = [TEST_PATH]/backrest/archive/db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-archive-get-003.log b/test/expect/backup-archive-get-003.log index 298a0ef1f..9a6a79128 100644 --- a/test/expect/backup-archive-get-003.log +++ b/test/expect/backup-archive-get-003.log @@ -9,8 +9,8 @@ run 003 - rmt 0, cmp 1, exists 0 DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = none, strStanza = db DEBUG: ArchiveInfo->new(): bRequired = true, strArchiveClusterPath = [TEST_PATH]/backrest/archive/db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-archive-get-004.log b/test/expect/backup-archive-get-004.log index 6b68b9f7d..2e04f68be 100644 --- a/test/expect/backup-archive-get-004.log +++ b/test/expect/backup-archive-get-004.log @@ -9,8 +9,8 @@ run 004 - rmt 0, cmp 1, exists 1 DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = none, strStanza = db DEBUG: ArchiveInfo->new(): bRequired = true, strArchiveClusterPath = [TEST_PATH]/backrest/archive/db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-archive-get-005.log b/test/expect/backup-archive-get-005.log index 034cfe6b5..c208579f0 100644 --- a/test/expect/backup-archive-get-005.log +++ b/test/expect/backup-archive-get-005.log @@ -10,8 +10,8 @@ run 005 - rmt 1, cmp 0, exists 0 DEBUG: Protocol::CommonMaster->new(): iBufferMax = 4194304, iCompressLevel = 6, iCompressLevelNetwork = 3, iProtocolTimeout = 1830, strCommand = ssh -o Compression=no -o PasswordAuthentication=no backrest@127.0.0.1 '[BACKREST_BIN] --command=archive-get --config=[TEST_PATH]/backrest/pgbackrest.conf --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --repo-path=[TEST_PATH]/backrest --stanza=db remote', strName = remote DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = backup, strStanza = db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-archive-get-006.log b/test/expect/backup-archive-get-006.log index b0c75514d..4a110e61e 100644 --- a/test/expect/backup-archive-get-006.log +++ b/test/expect/backup-archive-get-006.log @@ -10,8 +10,8 @@ run 006 - rmt 1, cmp 0, exists 1 DEBUG: Protocol::CommonMaster->new(): iBufferMax = 4194304, iCompressLevel = 6, iCompressLevelNetwork = 3, iProtocolTimeout = 1830, strCommand = ssh -o Compression=no -o PasswordAuthentication=no backrest@127.0.0.1 '[BACKREST_BIN] --command=archive-get --config=[TEST_PATH]/backrest/pgbackrest.conf --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --repo-path=[TEST_PATH]/backrest --stanza=db remote', strName = remote DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = backup, strStanza = db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-archive-get-007.log b/test/expect/backup-archive-get-007.log index 68c52020f..fff7b5af2 100644 --- a/test/expect/backup-archive-get-007.log +++ b/test/expect/backup-archive-get-007.log @@ -10,8 +10,8 @@ run 007 - rmt 1, cmp 1, exists 0 DEBUG: Protocol::CommonMaster->new(): iBufferMax = 4194304, iCompressLevel = 6, iCompressLevelNetwork = 3, iProtocolTimeout = 1830, strCommand = ssh -o Compression=no -o PasswordAuthentication=no backrest@127.0.0.1 '[BACKREST_BIN] --command=archive-get --config=[TEST_PATH]/backrest/pgbackrest.conf --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --repo-path=[TEST_PATH]/backrest --stanza=db remote', strName = remote DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = backup, strStanza = db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-archive-get-008.log b/test/expect/backup-archive-get-008.log index 59905179f..ec58f8b76 100644 --- a/test/expect/backup-archive-get-008.log +++ b/test/expect/backup-archive-get-008.log @@ -10,8 +10,8 @@ run 008 - rmt 1, cmp 1, exists 1 DEBUG: Protocol::CommonMaster->new(): iBufferMax = 4194304, iCompressLevel = 6, iCompressLevelNetwork = 3, iProtocolTimeout = 1830, strCommand = ssh -o Compression=no -o PasswordAuthentication=no backrest@127.0.0.1 '[BACKREST_BIN] --command=archive-get --config=[TEST_PATH]/backrest/pgbackrest.conf --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --repo-path=[TEST_PATH]/backrest --stanza=db remote', strName = remote DEBUG: File->new(): iThreadIdx = [undef], oProtocol = [object], strBackupPath = [TEST_PATH]/backrest, strDefaultFileMode = <0640>, strDefaultPathMode = <0750>, strRemote = backup, strStanza = db ERROR: [130]: archive.info does not exist but is required to get WAL segments - HINT: Is archive_command configured in postgresql.conf? - HINT: Use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. + HINT: is archive_command configured in postgresql.conf? + HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme. DEBUG: Exit::exitSafe(): iExitCode = 130, strSignal = [undef] INFO: archive-get stop DEBUG: Common:::Lock::lockRelease(): bFailOnNoLock = false diff --git a/test/expect/backup-synthetic-001.log b/test/expect/backup-synthetic-001.log index 5f9e3872c..a34cb59ef 100644 --- a/test/expect/backup-synthetic-001.log +++ b/test/expect/backup-synthetic-001.log @@ -919,7 +919,7 @@ incr backup (invalid database version) INFO: backup start: --no-compress --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -928,7 +928,7 @@ incr backup (invalid system id) INFO: backup start: --no-compress --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/expect/backup-synthetic-002.log b/test/expect/backup-synthetic-002.log index 3b24f6017..c89dbe181 100644 --- a/test/expect/backup-synthetic-002.log +++ b/test/expect/backup-synthetic-002.log @@ -715,7 +715,7 @@ incr backup (invalid database version) INFO: backup start: --no-compress --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -724,7 +724,7 @@ incr backup (invalid system id) INFO: backup start: --no-compress --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/expect/backup-synthetic-003.log b/test/expect/backup-synthetic-003.log index 7bb5f00b6..a485b2b6a 100644 --- a/test/expect/backup-synthetic-003.log +++ b/test/expect/backup-synthetic-003.log @@ -711,7 +711,7 @@ incr backup (invalid database version) INFO: backup start: --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -720,7 +720,7 @@ incr backup (invalid system id) INFO: backup start: --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/expect/backup-synthetic-004.log b/test/expect/backup-synthetic-004.log index df056ed7f..bb63e2f6e 100644 --- a/test/expect/backup-synthetic-004.log +++ b/test/expect/backup-synthetic-004.log @@ -713,7 +713,7 @@ incr backup (invalid database version) INFO: backup start: --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -722,7 +722,7 @@ incr backup (invalid system id) INFO: backup start: --config=[TEST_PATH]/db/pgbackrest.conf --config-remote=[TEST_PATH]/backrest/pgbackrest.conf --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/expect/backup-synthetic-005.log b/test/expect/backup-synthetic-005.log index 74470b405..cb61ac8dd 100644 --- a/test/expect/backup-synthetic-005.log +++ b/test/expect/backup-synthetic-005.log @@ -1024,7 +1024,7 @@ incr backup (invalid database version) INFO: backup start: --cmd-remote=[BACKREST_BIN] --no-compress --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -1033,7 +1033,7 @@ incr backup (invalid system id) INFO: backup start: --cmd-remote=[BACKREST_BIN] --no-compress --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/expect/backup-synthetic-006.log b/test/expect/backup-synthetic-006.log index 96c449373..a9518bc69 100644 --- a/test/expect/backup-synthetic-006.log +++ b/test/expect/backup-synthetic-006.log @@ -743,7 +743,7 @@ incr backup (invalid database version) INFO: backup start: --cmd-remote=[BACKREST_BIN] --no-compress --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -752,7 +752,7 @@ incr backup (invalid system id) INFO: backup start: --cmd-remote=[BACKREST_BIN] --no-compress --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/expect/backup-synthetic-007.log b/test/expect/backup-synthetic-007.log index d27e74beb..8b0d67d33 100644 --- a/test/expect/backup-synthetic-007.log +++ b/test/expect/backup-synthetic-007.log @@ -737,7 +737,7 @@ incr backup (invalid database version) INFO: backup start: --cmd-remote=[BACKREST_BIN] --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -746,7 +746,7 @@ incr backup (invalid system id) INFO: backup start: --cmd-remote=[BACKREST_BIN] --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/expect/backup-synthetic-008.log b/test/expect/backup-synthetic-008.log index 8ef51c553..9c9647354 100644 --- a/test/expect/backup-synthetic-008.log +++ b/test/expect/backup-synthetic-008.log @@ -739,7 +739,7 @@ incr backup (invalid database version) INFO: backup start: --cmd-remote=[BACKREST_BIN] --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 8.0, system-id = 6156904820763115222 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid system id) @@ -748,7 +748,7 @@ incr backup (invalid system id) INFO: backup start: --cmd-remote=[BACKREST_BIN] --config=[TEST_PATH]/backrest/pgbackrest.conf --config-remote=[TEST_PATH]/db/pgbackrest.conf --db-host=127.0.0.1 --db-path=[TEST_PATH]/db/common --db-port=[PORT-1] --db-socket-path=[TEST_PATH]/db --db-user=vagrant --hardlink --lock-path=[TEST_PATH]/backrest/lock --log-level-console=detail --log-level-file=trace --log-path=[TEST_PATH]/backrest/log --no-online --repo-path=[TEST_PATH]/backrest --stanza=db --start-fast INFO: last backup label = [BACKUP-FULL-2], version = [VERSION-1] ERROR: [126]: database version = 9.3, system-id 6156904820763115222 does not match backup version = 9.3, system-id = 6999999999999999999 - HINT: are you backing up to the correct stanza? + HINT: is this the correct stanza? INFO: backup stop incr backup (invalid control version) diff --git a/test/lib/pgBackRestTest/ConfigTest.pm b/test/lib/pgBackRestTest/ConfigTest.pm index 8d8b1e577..f05b4a9dd 100755 --- a/test/lib/pgBackRestTest/ConfigTest.pm +++ b/test/lib/pgBackRestTest/ConfigTest.pm @@ -544,7 +544,7 @@ sub BackRestTestConfig_Test { optionSetTest($oOption, OPTION_STANZA, $strStanza); - configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_REQUIRED, OPTION_DB_PATH, 'Does this stanza exist?'); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_REQUIRED, OPTION_DB_PATH, 'does this stanza exist?'); } }