db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00
Code Issues Releases Activity

Fixed the check command to prevent an error message from being logged if the backup directory does not exist.

Browse Source 
Fixed by Cynthia Shang.
This commit is contained in:
Cynthia Shang 2016-09-27 18:01:38 -04:00 committed by David Steele
parent 25f40f9b15
commit 76673a8e62
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/xml/release.xml
View File

@ -116,6 +116,16 @@
<release-list> <release-list>
<release date="XXXX-XX-XX" version="1.09dev" title="UNDER DEVELOPMENT"> <release date="XXXX-XX-XX" version="1.09dev" title="UNDER DEVELOPMENT">
<release-core-list> <release-core-list>
<release-bug-list>
<release-item>
<release-item-contributor-list>
<release-item-contributor id="shang.cynthia"/>
</release-item-contributor-list>
<p>Fixed the <cmd>check</cmd> command to prevent an error message from being logged if the backup directory does not exist.</p>
</release-item>
</release-bug-list>
<release-refactor-list> <release-refactor-list>
<release-item> <release-item>
<p><backrest/> version number included in command start INFO log output.</p> <p><backrest/> version number included in command start INFO log output.</p>

54
lib/pgBackRest/Archive.pm
View File

@ -494,8 +494,7 @@ sub getBackupInfoCheck
if (!defined($strDbVersion) || !defined($iControlVersion) || !defined($iCatalogVersion) || !defined($ullDbSysId)) if (!defined($strDbVersion) || !defined($iControlVersion) || !defined($iCatalogVersion) || !defined($ullDbSysId))
{ {
# get DB info for comparison # get DB info for comparison
($strDbVersion, $iControlVersion, $iCatalogVersion, $ullDbSysId) = ($strDbVersion, $iControlVersion, $iCatalogVersion, $ullDbSysId) = (new pgBackRest::Db(1))->info(optionGet(OPTION_DB_PATH));
(new pgBackRest::Db(1))->info(optionGet(OPTION_DB_PATH));
} }
if ($oFile->isRemote(PATH_BACKUP)) if ($oFile->isRemote(PATH_BACKUP))
@ -513,29 +512,8 @@ sub getBackupInfoCheck
} }
else else
{ {
my $oBackupInfo = undef; $iDbHistoryId = (new pgBackRest::BackupInfo($oFile->pathGet(PATH_BACKUP_CLUSTER)))->check(
$strDbVersion, $iControlVersion, $iCatalogVersion, $ullDbSysId);
# Load or build backup.info
eval
{
$oBackupInfo = new pgBackRest::BackupInfo($oFile->pathGet(PATH_BACKUP_CLUSTER));
return true;
}
# If there is an error but it is not that the file is missing then confess
or do
{
if (!isException($EVAL_ERROR) || $EVAL_ERROR->code() != ERROR_PATH_MISSING)
{
confess $EVAL_ERROR;
}
};
# Check that the stanza backup info is compatible with the current version of the database
# If not, an error will be thrown
if (defined($oBackupInfo))
{
$iDbHistoryId = $oBackupInfo->check($strDbVersion, $iControlVersion, $iCatalogVersion, $ullDbSysId);
}
} }
# Return from function and log return values if any # Return from function and log return values if any
@ -1208,16 +1186,32 @@ sub check
}; };
} }
# Reset the console logging
logLevelSet(undef, optionGet(OPTION_LOG_LEVEL_CONSOLE));
# If the archive info was successful, then check the backup info # If the archive info was successful, then check the backup info
if ($iResult == 0) if ($iResult == 0)
{ {
# Check the backup info # Check the backup info
my $iDbHistoryId = $self->getBackupInfoCheck($oFile); eval
{
$self->getBackupInfoCheck($oFile);
return true;
}
# If there is an error but it is not that the file is missing then confess
or do
{
if (!isException($EVAL_ERROR) || $EVAL_ERROR->code() != ERROR_PATH_MISSING)
{
confess $EVAL_ERROR;
}
};
}
# If the backup and archive checks were successful, then indicate success # Reset the console logging
logLevelSet(undef, optionGet(OPTION_LOG_LEVEL_CONSOLE));
# If the archive info was successful and backup.info check did not error in an unexpected way, then indicate success
# Else, log the error.
if ($iResult == 0)
{
&log(INFO, &log(INFO,
"WAL segment ${strWalSegment} successfully stored in the archive at '" . "WAL segment ${strWalSegment} successfully stored in the archive at '" .
$oFile->pathGet(PATH_BACKUP_ARCHIVE, "$strArchiveId/${strArchiveFile}") . "'"); $oFile->pathGet(PATH_BACKUP_ARCHIVE, "$strArchiveId/${strArchiveFile}") . "'");