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

Merge branch 'dev-0.30' of https://github.com/dwsteele/pg_backrest into dev

Browse Source
This commit is contained in:
David Steele 2014-09-29 19:51:51 -04:00
commit 5f30ae3c46
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pg_backrest.pl
View File

@ -85,7 +85,7 @@ use constant
CONFIG_KEY_HARDLINK => 'hardlink',
CONFIG_KEY_ARCHIVE_REQUIRED => 'archive-required',
CONFIG_KEY_ARCHIVE_MAX_MB => 'archive-max-mb',
CONFIG_KEY_START_FAST => 'start_fast',
CONFIG_KEY_START_FAST => 'start-fast',
CONFIG_KEY_COMPRESS_ASYNC => 'compress-async',
CONFIG_KEY_LEVEL_FILE => 'level-file',
@ -591,7 +591,7 @@ if ($strOperation eq OP_ARCHIVE_GET)
&log(INFO, 'getting archive log ' . $ARGV[1]);
# Get the archive file
remote_exit(archive_get($ARGV[1], $ARGV[2]));
remote_exit(archive_get(config_key_load(CONFIG_SECTION_STANZA, CONFIG_KEY_PATH), $ARGV[1], $ARGV[2]));
}
####################################################################################################################################

12
lib/BackRest/Backup.pm
View File

@ -229,9 +229,21 @@ sub backup_thread_complete
####################################################################################################################################
sub archive_get
{
my $strDbClusterPath = shift;
my $strSourceArchive = shift;
my $strDestinationFile = shift;
# If the destination file path is not absolute then it is relative to the data path
if (index($strDestinationFile, '/',) != 0)
{
if (!defined($strDbClusterPath))
{
confess &log(ERROR, 'database path must be set if relative xlog paths are used');
}
$strDestinationFile = "${strDbClusterPath}/${strDestinationFile}";
}
# Determine the path where the requested archive file is located
my $strArchivePath = dirname($oFile->path_get(PATH_BACKUP_ARCHIVE, $strSourceArchive));