db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-10-30 23:37:45 +02:00
Code Issues Releases Activity

Hash of compressed file is working.

Browse Source 
Something still broken in binary_xfer because some 0 length archive files are showing up.  Investigating.
This commit is contained in:
David Steele
2015-02-27 18:42:28 -05:00
parent 53f783d3fe
commit 25442655c8
2 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/BackRest/File.pm
View File

@@ -804,7 +804,51 @@ sub hash
if ($bCompressed)
{
confess "CANNOT DECOMPRESS WITH MISSING REMOTE";
my $bFirst = true;
my $tCompressedBuffer;
my $tUncompressedBuffer;
my $iBlockSize;
my $iBlockIn;
my $oGzip;
do
{
# Read a block from the file
$iBlockSize = sysread($hFile, $tCompressedBuffer, 1000000);
if (!defined($iBlockSize))
{
confess &log(ERROR, "${strFileOp} could not be read: " . $!);
}
# If this is the first block then initialize Gunzip
if ($bFirst)
{
# Initialize Gunzip
$oGzip = new IO::Uncompress::Gunzip(\$tCompressedBuffer, Transparent => 0, BlockSize => 1000000)
or confess "IO::Uncompress::Gunzip failed: $GunzipError";
# Clear first block flag
$bFirst = false;
}
# Loop while there is more data to uncompress
while (!$oGzip->eof())
{
# Decompress the block
$iBlockIn = $oGzip->read($tUncompressedBuffer);
if ($iBlockIn < 0)
{
confess &log(ERROR, "unable to decompress stream ($iBlockIn): ${GunzipError}");
}
$oSHA->add($tUncompressedBuffer);
}
}
while ($iBlockSize > 0);
$oGzip->close();
}
else
{
@@ -1332,7 +1376,7 @@ sub copy
{
if ($strDestinationPathType eq PIPE_STDOUT)
{
$self->{oRemote}->write_line(*STDOUT, 'block 0');
$self->{oRemote}->write_line(*STDOUT, 'block -1');
}
confess &log(ERROR, $strError, $iErrorCode);

23
lib/BackRest/Remote.pm
View File

@@ -361,17 +361,17 @@ sub block_read
# Read the block header and make sure it's valid
my $strBlockHeader = $self->read_line($hIn);
if ($strBlockHeader !~ /^block [0-9]+$/)
if ($strBlockHeader !~ /^block -{0,1}[0-9]+$/)
{
$self->wait_pid();
confess "unable to read block header: ${strBlockHeader}";
confess "unable to read block header ${strBlockHeader}";
}
# Get block size from the header
my $iBlockSize = trim(substr($strBlockHeader, index($strBlockHeader, ' ') + 1));
# If block size is zero then undef the buffer
if ($iBlockSize == 0)
# If block size is 0 or an error code then undef the buffer
if ($iBlockSize <= 0)
{
undef($$strBlockRef);
}
@@ -542,12 +542,23 @@ sub binary_xfer
# Read a block from the protocol stream
$iBlockSize = $self->block_read($hIn, \$strBlockBuffer);
# If block size = -1 it means an error happened on the remote we need to exit so it can be returned.
if ($iBlockSize == -1)
{
last;
}
# If this is the first block then initialize Gunzip
if ($bFirst)
{
if ($iBlockSize == 0)
{
&log(ASSERT, 'first protocol block is zero');
}
# Gunzip doesn't like to be initialized with just the header, so if the first block is 10 bytes then fetch
# another another block to make sure so is at least some payload.
if ($iBlockSize == 10)
if ($iBlockSize <= 10)
{
$iBlockSize = $self->block_read($hIn, \$strBlockBuffer);
}
@@ -555,7 +566,7 @@ sub binary_xfer
# Initialize Gunzip
$oGzip = new IO::Uncompress::Gunzip(\$strBlockBuffer, Append => 1, Transparent => 0,
BlockSize => $self->{iBlockSize})
or confess "IO::Uncompress::Gunzip failed: $GunzipError";
or confess "IO::Uncompress::Gunzip failed (${iBlockSize}): $GunzipError";
# Clear first block flag
$bFirst = false;