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

For no just ignore sizes in the tests since they are normal and do not indicate a bad backup.

Browse Source
This commit is contained in:
David Steele 2015-02-02 08:28:37 -05:00
parent a6d3b7e1a9
commit 8abcf6caf1
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1095,44 +1095,45 @@ sub BackRestTestBackup_RestoreCompare
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'))
{
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))
{
my $strSectionPath = $oActualManifest->get('backup:path', $strSectionPathKey);
$oActualManifest->set($strSection, $strName, 'size', ${$oExpectedManifestRef}{$strSection}{$strName}{size});
# 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 &&
defined(${$oExpectedManifestRef}{'backup:option'}{checksum}) &&
${$oExpectedManifestRef}{'backup:option'}{checksum} eq 'y')
{
if ($oActualManifest->get($strSection, $strName, 'size') != 0)
{
$oActualManifest->set($strSection, $strName, 'checksum',
$oFile->hash(PATH_DB_ABSOLUTE, "${strSectionPath}/${strName}"));
}
$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});
}
}
# 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'});