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

Removed WAL from some option names - still waffling on this naming thing.

Browse Source
This commit is contained in:
David Steele 2015-03-23 16:01:15 -04:00
parent 66c474abe2
commit 8a3c6388b2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/BackRest/Backup.pm
View File

@ -1299,7 +1299,7 @@ sub backup
# If archive logs are required to complete the backup, then fetch them. This is the default, but can be overridden if the
# archive logs are going to a different server. Be careful here because there is no way to verify that the backup will be
# consistent - at least not in this routine.
if (!optionGet(OPTION_NO_START_STOP) && optionGet(OPTION_BACKUP_WAL_CHECK))
if (!optionGet(OPTION_NO_START_STOP) && optionGet(OPTION_BACKUP_ARCHIVE_CHECK))
{
# Save the backup manifest a second time - before getting archive logs in case that fails
$oBackupManifest->save();
@ -1325,7 +1325,7 @@ sub backup
confess &log(ERROR, "Zero or more than one file found for glob: ${strArchivePath}");
}
if (optionGet(OPTION_BACKUP_WAL_STORE))
if (optionGet(OPTION_BACKUP_ARCHIVE_COPY))
{
&log(DEBUG, "archiving: ${strArchive} (${stryArchiveFile[0]})");

20
lib/BackRest/Config.pm
View File

@ -121,8 +121,8 @@ use constant
OPTION_ARCHIVE_ASYNC => 'archive-async',
# BACKUP Section
OPTION_BACKUP_WAL_CHECK => 'backup-wal-check',
OPTION_BACKUP_WAL_STORE => 'backup-wal-store',
OPTION_BACKUP_ARCHIVE_CHECK => 'backup-archive-check',
OPTION_BACKUP_ARCHIVE_COPY => 'backup-archive-copy',
OPTION_HARDLINK => 'hardlink',
OPTION_BACKUP_HOST => 'backup-host',
OPTION_BACKUP_USER => 'backup-user',
@ -165,7 +165,7 @@ use constant
push @EXPORT, qw(OPTION_CONFIG OPTION_DELTA OPTION_FORCE OPTION_NO_START_STOP OPTION_SET OPTION_STANZA OPTION_TARGET
OPTION_TARGET_EXCLUSIVE OPTION_TARGET_RESUME OPTION_TARGET_TIMELINE OPTION_TYPE
OPTION_DB_HOST OPTION_BACKUP_HOST OPTION_ARCHIVE_MAX_MB OPTION_BACKUP_WAL_CHECK OPTION_BACKUP_WAL_STORE
OPTION_DB_HOST OPTION_BACKUP_HOST OPTION_ARCHIVE_MAX_MB OPTION_BACKUP_ARCHIVE_CHECK OPTION_BACKUP_ARCHIVE_COPY
OPTION_ARCHIVE_ASYNC
OPTION_BUFFER_SIZE OPTION_COMPRESS OPTION_COMPRESS_LEVEL OPTION_COMPRESS_LEVEL_NETWORK OPTION_HARDLINK
OPTION_PATH_ARCHIVE OPTION_REPO_PATH OPTION_REPO_REMOTE_PATH OPTION_DB_PATH OPTION_LOG_LEVEL_CONSOLE
@ -204,8 +204,8 @@ use constant
OPTION_DEFAULT_COMMAND_PSQL => '/usr/bin/psql',
OPTION_DEFAULT_COMMAND_REMOTE => dirname(abs_path($0)) . '/pg_backrest_remote.pl',
OPTION_DEFAULT_BACKUP_WAL_CHECK => true,
OPTION_DEFAULT_BACKUP_WAL_STORE => false,
OPTION_DEFAULT_BACKUP_ARCHIVE_CHECK => true,
OPTION_DEFAULT_BACKUP_ARCHIVE_COPY => false,
OPTION_DEFAULT_BACKUP_FORCE => false,
OPTION_DEFAULT_BACKUP_HARDLINK => false,
OPTION_DEFAULT_BACKUP_NO_START_STOP => false,
@ -651,10 +651,10 @@ my %oOptionRule =
}
},
&OPTION_BACKUP_WAL_CHECK =>
&OPTION_BACKUP_ARCHIVE_CHECK =>
{
&OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN,
&OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_WAL_CHECK,
&OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_ARCHIVE_CHECK,
&OPTION_RULE_SECTION => true,
&OPTION_RULE_OPERATION =>
{
@ -662,10 +662,10 @@ my %oOptionRule =
}
},
&OPTION_BACKUP_WAL_STORE =>
&OPTION_BACKUP_ARCHIVE_COPY =>
{
&OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN,
&OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_WAL_STORE,
&OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_ARCHIVE_COPY,
&OPTION_RULE_SECTION => true,
&OPTION_RULE_OPERATION =>
{
@ -673,7 +673,7 @@ my %oOptionRule =
{
&OPTION_RULE_DEPEND =>
{
&OPTION_RULE_DEPEND_OPTION => OPTION_BACKUP_WAL_CHECK,
&OPTION_RULE_DEPEND_OPTION => OPTION_BACKUP_ARCHIVE_CHECK,
&OPTION_RULE_DEPEND_VALUE => true
}
}