db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-18 04:58:51 +02:00
Code Issues Releases Activity

Working on checking restores against the manifest. Current issue is that the manifest does not always record the final size of the file - it may change while the file is being copied. This is fine in principal but makes testing a pain.

Browse Source
This commit is contained in:
David Steele 2015-01-31 23:04:24 -05:00
parent 018a2afaca
commit a6d3b7e1a9
3 changed files with 125 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/BackRest/Manifest.pm
View File

@ -530,7 +530,7 @@ sub build
my %oTablespaceManifestHash;
$oFile->manifest(PATH_DB_ABSOLUTE, $strDbClusterPath . '/pg_tblspc', \%oTablespaceManifestHash);
foreach my $strName (sort(keys $oTablespaceManifestHash{name}))
foreach my $strName (sort(CORE::keys $oTablespaceManifestHash{name}))
{
if ($strName eq '.' or $strName eq '..')
{

8
lib/BackRest/Restore.pm
View File

@ -666,6 +666,14 @@ sub restore_thread
$oFileThread->hash(PATH_DB_ABSOLUTE, $strDestinationFile) eq $strChecksum)
{
&log(DEBUG, "${strDestinationFile} exists and matches backup checksum ${strChecksum}");
# Even if hash is the same set the time back to backup time. This helps with unit testing, but also
# presents a pristine version of the database.
utime($oManifest->get($strSection, $strName, MANIFEST_SUBKEY_MODIFICATION_TIME),
$oManifest->get($strSection, $strName, MANIFEST_SUBKEY_MODIFICATION_TIME),
$strDestinationFile)
or confess &log(ERROR, "unable to set time for ${strDestinationFile}");
next;
}
# Else use size/timestamp delta

116
test/lib/BackRestTest/BackupTest.pm
View File

@ -1016,6 +1016,26 @@ sub BackRestTestBackup_Restore
(defined($iExpectedExitStatus) ? ", expect exit ${iExpectedExitStatus}" : '') .
(defined($strComment) ? " (${strComment})" : ''));
if (!defined($oExpectedManifestRef))
{
# Change permissions on the backup path so it can be read
if ($bRemote)
{
BackRestTestCommon_Execute('chmod 750 ' . BackRestTestCommon_BackupPathGet(), true);
}
my $oExpectedManifest = new BackRest::Manifest(BackRestTestCommon_BackupPathGet() .
"/backup/${strStanza}/${strBackup}/backup.manifest", true);
$oExpectedManifestRef = $oExpectedManifest->{oManifest};
# Change permissions on the backup path back before unit tests continue
if ($bRemote)
{
BackRestTestCommon_Execute('chmod 700 ' . BackRestTestCommon_BackupPathGet(), true);
}
}
if (defined($oRemapHashRef))
{
BackRestTestCommon_ConfigRemap($oRemapHashRef, $oExpectedManifestRef, $bRemote);
@ -1038,6 +1058,102 @@ sub BackRestTestBackup_Restore
(defined($bTargetResume) && $bTargetResume ? " --target-resume" : '') .
" --stanza=${strStanza} restore",
undef, undef, undef, $iExpectedExitStatus);
if (!defined($iExpectedExitStatus))
{
BackRestTestBackup_RestoreCompare($oFile, $strStanza, $bRemote, $strBackup, $oExpectedManifestRef);
}
}
####################################################################################################################################
# BackRestTestBackup_RestoreCompare
####################################################################################################################################
sub BackRestTestBackup_RestoreCompare
{
my $oFile = shift;
my $strStanza = shift;
my $bRemote = shift;
my $strBackup = shift;
my $oExpectedManifestRef = shift;
my $strTestPath = BackRestTestCommon_TestPathGet();
# Load the last manifest if it exists
my $oLastManifest = undef;
if (defined(${$oExpectedManifestRef}{'backup'}{'prior'}))
{
$oLastManifest = new BackRest::Manifest(BackRestTestCommon_BackupPathGet() .
"/backup/${strStanza}/${strBackup}/backup.manifest", true);
}
# Generate the actual manifest
my $oActualManifest = new BackRest::Manifest("${strTestPath}/actual.manifest", false);
my %oTablespaceMap;
$oActualManifest->build($oFile, ${$oExpectedManifestRef}{'backup:path'}{'base'}, $oLastManifest, false, \%oTablespaceMap);
delete(${$oActualManifest->{oManifest}}{'backup'}{'timestamp-copy-start'});
# Build paths/links in each restore path
if (defined(${$oExpectedManifestRef}{'backup:option'}{checksum}) && ${$oExpectedManifestRef}{'backup:option'}{checksum} eq 'y')
{
foreach my $strSectionPathKey ($oActualManifest->keys('backup:path'))
{
my $strSectionPath = $oActualManifest->get('backup:path', $strSectionPathKey);
# Create all paths in the manifest that do not already exist
my $strSection = "${strSectionPathKey}:file";
foreach my $strName ($oActualManifest->keys($strSection))
{
if ($oActualManifest->get($strSection, $strName, 'size') != 0)
{
$oActualManifest->set($strSection, $strName, 'checksum',
$oFile->hash(PATH_DB_ABSOLUTE, "${strSectionPath}/${strName}"));
}
}
}
}
# Now get rid of all pg_xlog files in the actual and expected manifests
my $strSection = "base:file";
foreach my $strName ($oActualManifest->keys($strSection))
{
if ($strName =~ /^pg_xlog\/.*$/)
{
$oActualManifest->remove($strSection, $strName);
}
}
foreach my $strName (sort(keys(${$oExpectedManifestRef}{$strSection})))
{
if ($strName =~ /^pg_xlog\/.*$/)
{
delete(${$oExpectedManifestRef}{$strSection}{$strName});
}
}
delete(${$oExpectedManifestRef}{'backup:option'});
delete(${$oExpectedManifestRef}{'backup'}{'archive-start'});
delete(${$oExpectedManifestRef}{'backup'}{'archive-stop'});
delete(${$oExpectedManifestRef}{'backup'}{'label'});
delete(${$oExpectedManifestRef}{'backup'}{'type'});
delete(${$oExpectedManifestRef}{'backup'}{'version'});
delete(${$oExpectedManifestRef}{'backup'}{'timestamp-db-start'});
delete(${$oExpectedManifestRef}{'backup'}{'timestamp-db-stop'});
delete(${$oExpectedManifestRef}{'backup'}{'timestamp-start'});
delete(${$oExpectedManifestRef}{'backup'}{'timestamp-stop'});
delete(${$oExpectedManifestRef}{'backup'}{'timestamp-copy-start'});
delete(${$oExpectedManifestRef}{'backup'}{'checksum'});
ini_save("${strTestPath}/actual.manifest", $oActualManifest->{oManifest});
ini_save("${strTestPath}/expected.manifest", $oExpectedManifestRef);
BackRestTestCommon_Execute("diff ${strTestPath}/expected.manifest ${strTestPath}/actual.manifest");
$oFile->remove(PATH_ABSOLUTE, "${strTestPath}/expected.manifest");
$oFile->remove(PATH_ABSOLUTE, "${strTestPath}/actual.manifest");
}
####################################################################################################################################