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

Working on plumbing for recovery options.

Browse Source
This commit is contained in:
David Steele 2015-01-26 11:01:24 -05:00
parent eeffd62a12
commit ac22c314a9
4 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/pg_backrest.pl
View File

@ -35,7 +35,7 @@ pg_backrest.pl - Simple Postgres Backup and Restore
pg_backrest.pl [options] [operation]
Operation:
Operations:
archive-get retrieve an archive file from backup
archive-push push an archive file to backup
backup backup a cluster
@ -56,16 +56,22 @@ pg_backrest.pl [options] [operation]
Restore Options:
--set backup set to restore (defaults to latest set).
--delta perform a delta restore using checksums when available.
--delta perform a delta restore using checksums when present.
--force force a restore and overwrite all existing files.
with --delta forces size/timestamp delta even if checksums are present.
Recovery Options:
--type type of restore (name, time, xid, preserve, none).
--target target to restore if name, time, or xid specified for type.
--type type of recovery:
name - restore point target
time - timestamp target
xid - transaction id target
preserve - preserve the existing recovery.conf
none - no recovery past database becoming consistent
default - recover to end of archive log stream
--target recovery target if type is name, time, or xid.
--target-exclusive stop just before the recovery target (default is inclusive).
--target-resume do not pause after recovery to target.
--target-timeline recover into the specified timeline.
--target-resume do not pause after recovery (default is to pause).
--target-timeline recover into specified timeline (default is current timeline).
=cut
@ -447,7 +453,12 @@ if (operation_get() eq OP_RESTORE)
$oFile,
undef, #param_get(PARAM_THREAD),
param_get(PARAM_DELTA),
param_get(PARAM_FORCE)
param_get(PARAM_FORCE),
param_get(PARAM_TARGET),
param_get(PARAM_TARGET_EXCLUSIVE),
param_get(PARAM_TARGET_RESUME),
param_get(PARAM_TARGET_TIMELINE),
config_section_load(CONFIG_SECTION_RECOVERY)
)->restore;
remote_exit(0);

31
lib/BackRest/Config.pm
View File

@ -27,12 +27,14 @@ our @EXPORT = qw(config_load config_key_load config_section_load operation_get o
BACKUP_TYPE_FULL BACKUP_TYPE_DIFF BACKUP_TYPE_INCR
PARAM_CONFIG PARAM_STANZA PARAM_TYPE PARAM_DELTA PARAM_SET PARAM_NO_START_STOP PARAM_FORCE
PARAM_CONFIG PARAM_STANZA PARAM_TYPE PARAM_DELTA PARAM_SET PARAM_NO_START_STOP PARAM_FORCE PARAM_TARGET
PARAM_TARGET_EXCLUSIVE PARAM_TARGET_RESUME PARAM_TARGET_TIMELINE CONFIG_SECTION_RECOVERY
PARAM_VERSION PARAM_HELP PARAM_TEST PARAM_TEST_DELAY PARAM_TEST_NO_FORK
CONFIG_SECTION_COMMAND CONFIG_SECTION_COMMAND_OPTION CONFIG_SECTION_LOG CONFIG_SECTION_BACKUP
CONFIG_SECTION_RESTORE CONFIG_SECTION_TABLESPACE_MAP CONFIG_SECTION_ARCHIVE CONFIG_SECTION_RETENTION
CONFIG_SECTION_STANZA
CONFIG_SECTION_RESTORE CONFIG_SECTION_RECOVERY CONFIG_SECTION_TABLESPACE_MAP CONFIG_SECTION_ARCHIVE
CONFIG_SECTION_RETENTION CONFIG_SECTION_STANZA
CONFIG_KEY_USER CONFIG_KEY_HOST CONFIG_KEY_PATH
@ -128,7 +130,7 @@ use constant
CONFIG_SECTION_LOG => 'log',
CONFIG_SECTION_BACKUP => 'backup',
CONFIG_SECTION_RESTORE => 'restore',
CONFIG_SECTION_RESTORE_OPTION => 'restore:option',
CONFIG_SECTION_RECOVERY => 'recovery',
CONFIG_SECTION_TABLESPACE_MAP => 'tablespace:map',
CONFIG_SECTION_ARCHIVE => 'archive',
CONFIG_SECTION_RETENTION => 'retention',
@ -214,7 +216,7 @@ sub config_load
# Get and validate the operation
$strOperation = $ARGV[0];
param_valid();
# Set the backup type
@ -353,7 +355,7 @@ sub param_valid
{
confess &log(ERROR, "operation must be specified", ERROR_PARAM);
}
if ($strOperation ne OP_ARCHIVE_GET &&
$strOperation ne OP_ARCHIVE_PUSH &&
$strOperation ne OP_BACKUP &&
@ -362,7 +364,7 @@ sub param_valid
{
confess &log(ERROR, "invalid operation ${strOperation}");
}
# Check type param
my $strParam = PARAM_TYPE;
my $strType = param_get($strParam);
@ -373,10 +375,11 @@ sub param_valid
# Check types for backup
if (operation_test(OP_BACKUP))
{
# If type is not defined set to incr
# If type is not defined set to BACKUP_TYPE_INCR
if (!defined($strType))
{
$strType = BACKUP_TYPE_INCR;
param_set($strParam, $strType);
}
# Check that type is in valid list
@ -390,10 +393,11 @@ sub param_valid
# Check types for restore
elsif (operation_test(OP_RESTORE))
{
# If type is not defined set to default
# If type is not defined set to RESTORE_TYPE_DEFAULT
if (!defined($strType))
{
$strType = RESTORE_TYPE_DEFAULT;
param_set($strParam, $strType);
}
if (!($strType eq RESTORE_TYPE_NAME || $strType eq RESTORE_TYPE_TIME || $strType eq RESTORE_TYPE_XID ||
@ -412,7 +416,7 @@ sub param_valid
confess &log(ERROR, PARAM_TYPE . ' is only valid for '. OP_BACKUP . ' and ' . OP_RESTORE . ' operations', ERROR_PARAM);
}
}
# Check target param
$strParam = PARAM_TARGET;
my $strTarget = param_get($strParam);
@ -431,9 +435,10 @@ sub param_valid
{
confess &log(ERROR, PARAM_TARGET . ' is only required ' . $strTargetMessage, ERROR_PARAM);
}
# Check target-exclusive, target-resume, target-timeline parameters
if ((defined(PARAM_TARGET_EXCLUSIVE) || defined(PARAM_TARGET_RESUME) || defined(PARAM_TARGET_TIMELINE)) && !defined($strTarget))
if ((defined(param_get(PARAM_TARGET_EXCLUSIVE)) || defined(param_get(PARAM_TARGET_RESUME)) ||
defined(param_get(PARAM_TARGET_TIMELINE))) && !defined($strTarget))
{
confess &log(ERROR, PARAM_TARGET_EXCLUSIVE . ', ' . PARAM_TARGET_RESUME . ', and ' . PARAM_TARGET_TIMELINE .
' are only valid when target is specified');
@ -458,7 +463,7 @@ sub operation_get
sub operation_test
{
my $strOperationTest = shift;
return $strOperationTest eq $strOperation;
}

14
lib/BackRest/Restore.pm
View File

@ -34,6 +34,12 @@ sub new
my $iThreadTotal = shift; # Total threads to run for restore
my $bDelta = shift; # perform delta restore
my $bForce = shift; # force a restore
my $strType = shift; # Recovery type
my $strTarget = shift; # Recovery target
my $bTargetExclusive = shift; # Target exlusive option
my $bTargetResume = shift; # Target resume option
my $bTargetTimeline = shift; # Target timeline option
my $oRecoveryRef = shift; # Other recovery options
# Create the class hash
my $self = {};
@ -41,11 +47,17 @@ sub new
# Initialize variables
$self->{strDbClusterPath} = $strDbClusterPath;
$self->{oRemapRef} = $oRemapRef;
$self->{oFile} = $oFile;
$self->{iThreadTotal} = defined($iThreadTotal) ? $iThreadTotal : 1;
$self->{bDelta} = $bDelta;
$self->{bForce} = $bForce;
$self->{oRemapRef} = $oRemapRef;
$self->{strType} = $strType;
$self->{strTarget} = $strTarget;
$self->{bTargetExclusive} = $bTargetExclusive;
$self->{bTargetResume} = $bTargetResume;
$self->{bTargetTimeline} = $bTargetTimeline;
$self->{oRecoveryRef} = $oRecoveryRef;
# If backup path is not specified then default to latest
if (defined($strBackupPath))

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

@ -680,8 +680,9 @@ sub BackRestTestBackup_BackupBegin
BackRestTestCommon_ExecuteBegin(BackRestTestCommon_CommandMainGet() . ' --config=' .
($bRemote ? BackRestTestCommon_BackupPathGet() : BackRestTestCommon_DbPathGet()) .
"/pg_backrest.conf --no-start-stop --type=${strType} --stanza=${strStanza} backup" .
($bTestPoint ? " --test --test-delay=${fTestDelay}": ''), $bRemote);
"/pg_backrest.conf --no-start-stop" . ($strType ne 'incr' ? " --type=${strType}" : '') .
" --stanza=${strStanza} backup" . ($bTestPoint ? " --test --test-delay=${fTestDelay}": ''),
$bRemote);
}
####################################################################################################################################