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

Wait for archive files.

Browse Source
This commit is contained in:
David Steele 2014-02-13 20:29:42 -05:00
parent d4ba078183
commit a78d677b1e
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pg_backrest_backup.pm
View File

@ -649,7 +649,7 @@ sub backup_file
# Assign files to each thread queue
my $iThreadFileSmallIdx = 0;
my $iThreadFileSmallTotalMax = $lFileSmallTotal / $iThreadMax;
my $iThreadFileSmallTotalMax = int($lFileSmallTotal / $iThreadMax);
my $fThreadFileSmallSize = 0;
my $iThreadFileSmallTotal = 0;
@ -660,7 +660,7 @@ sub backup_file
&log(INFO, "file total ${lFileTotal}");
&log(INFO, "file small total ${lFileSmallTotal}, small size: " . file_size_format($lFileSmallSize) .
", small thread avg total ${iThreadFileSmallTotalMax} (");
", small thread avg total " . file_size_format(int($iThreadFileSmallTotalMax)));
&log(INFO, "file large total ${lFileLargeTotal}, large size: " . file_size_format($lFileLargeSize) .
", large thread avg size " . file_size_format(int($fThreadFileLargeSizeMax)));
@ -855,8 +855,8 @@ sub backup
# Delete files leftover from a partial backup
# !!! do it
# # Save the backup conf file first time - so we can see what is happening in the backup
# backup_manifest_save($strBackupConfFile, \%oBackupManifest);
# Save the backup conf file first time - so we can see what is happening in the backup
backup_manifest_save($strBackupConfFile, \%oBackupManifest);
# Perform the backup
backup_file($strBackupPath, $strDbClusterPath, \%oBackupManifest);
@ -873,10 +873,8 @@ sub backup
# consistent - at least not in this routine.
if ($bArchiveRequired)
{
sleep(10);
# # Save the backup conf file second time - before getting archive logs in case that fails
# backup_manifest_save($strBackupConfFile, \%oBackupManifest);
# Save the backup conf file second time - before getting archive logs in case that fails
backup_manifest_save($strBackupConfFile, \%oBackupManifest);
# After the backup has been stopped, need to make a copy of the archive logs need to make the db consistent
my @stryArchive = archive_list_get($strArchiveStart, $strArchiveStop, $oDb->version_get() < 9.3);
@ -884,6 +882,9 @@ sub backup
foreach my $strArchive (@stryArchive)
{
my $strArchivePath = dirname($oFile->path_get(PATH_BACKUP_ARCHIVE, $strArchive));
wait_for_file($strArchivePath, "^${strArchive}(-[0-f]+){0,1}(\\.$oFile->{strCompressExtension}){0,1}\$", 30);
my @stryArchiveFile = $oFile->file_list_get(PATH_BACKUP_ABSOLUTE, $strArchivePath,
"^${strArchive}(-[0-f]+){0,1}(\\.$oFile->{strCompressExtension}){0,1}\$");

32
pg_backrest_utility.pm
View File

@ -10,7 +10,8 @@ use IPC::System::Simple qw(capture);
use Exporter qw(import);
our @EXPORT = qw(data_hash_build trim common_prefix date_string_get file_size_format execute log log_file_set log_level_set
our @EXPORT = qw(data_hash_build trim common_prefix wait_for_file date_string_get file_size_format execute
log log_file_set log_level_set
TRACE DEBUG ERROR ASSERT WARN INFO true false);
# Global constants
@ -93,6 +94,35 @@ sub trim
return $strBuffer;
}
####################################################################################################################################
# WAIT_FOR_FILE
####################################################################################################################################
sub wait_for_file
{
my $strDir = shift;
my $strRegEx = shift;
my $iSeconds = shift;
my $lTime = time();
my $hDir;
while ($lTime > time() - $iSeconds)
{
opendir $hDir, $strDir or die "Could not open dir: $!\n";
my @stryFile = grep(/$strRegEx/i, readdir $hDir);
close $hDir;
if (scalar @stryFile == 1)
{
return;
}
sleep(1);
}
confess &log(ERROR, "could not find $strDir/$strRegEx after $iSeconds second(s)");
}
####################################################################################################################################
# COMMON_PREFIX
####################################################################################################################################

8
test/test.pl
View File

@ -124,7 +124,7 @@ sub wait_for_file
my $lTime = time();
my $hDir;
while ($lTime > time() - $iSeconds)
{
opendir $hDir, $strDir or die "Could not open dir: $!\n";
@ -135,11 +135,7 @@ sub wait_for_file
{
return;
}
# if (glob($strFile))
# {
# return;
# }
sleep(1);
}