From 06c290421240ed74f0388a3b71e240fc1a9e6162 Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 18 Jun 2015 16:55:09 -0400 Subject: [PATCH] Change operation constants and functions to command. --- bin/pg_backrest | 37 +- lib/BackRest/Archive.pm | 19 +- lib/BackRest/Config.pm | 502 ++++++++++++++-------------- lib/BackRest/Exception.pm | 8 +- lib/BackRest/Info.pm | 4 +- lib/BackRest/Remote.pm | 6 +- lib/BackRest/Restore.pm | 2 +- test/lib/BackRestTest/ConfigTest.pm | 170 +++++----- 8 files changed, 373 insertions(+), 375 deletions(-) diff --git a/bin/pg_backrest b/bin/pg_backrest index 2e7554e99..9613428ce 100755 --- a/bin/pg_backrest +++ b/bin/pg_backrest @@ -39,9 +39,9 @@ pg_backrest.pl - Simple Postgres Backup and Restore =head1 SYNOPSIS -pg_backrest.pl [options] [operation] +pg_backrest.pl [options] [command] - Operations: + Commands: archive-get retrieve an archive file from backup archive-push push an archive file to backup backup backup a cluster @@ -50,7 +50,6 @@ pg_backrest.pl [options] [operation] General Options: --stanza stanza (cluster) to operate on - (currently required for all operations) --config alternate path for pg_backrest.conf (defaults to /etc/pg_backrest.conf) --version display version and exit @@ -136,7 +135,7 @@ eval ################################################################################################################################ # Process remote commands ################################################################################################################################ - if (operationTest(OP_REMOTE)) + if (commandTest(CMD_REMOTE)) { # Turn all logging off log_level_set(OFF, OFF); @@ -165,7 +164,7 @@ eval ################################################################################################################################ # Process archive commands ################################################################################################################################ - if (operationTest(OP_ARCHIVE_PUSH) || operationTest(OP_ARCHIVE_GET)) + if (commandTest(CMD_ARCHIVE_PUSH) || commandTest(CMD_ARCHIVE_GET)) { safe_exit(new BackRest::Archive()->process()); } @@ -173,20 +172,20 @@ eval ################################################################################################################################ # Process info command ################################################################################################################################ - if (operationTest(OP_INFO)) + if (commandTest(CMD_INFO)) { safe_exit(new BackRest::Info()->info()); } ################################################################################################################################ - # Acquire the operation lock + # Acquire the command lock ################################################################################################################################ - lockAcquire(operationGet()); + lockAcquire(commandGet()); ################################################################################################################################ # Open the log file ################################################################################################################################ - log_file_set(optionGet(OPTION_REPO_PATH) . '/log/' . optionGet(OPTION_STANZA) . '-' . lc(operationGet())); + log_file_set(optionGet(OPTION_REPO_PATH) . '/log/' . optionGet(OPTION_STANZA) . '-' . lc(commandGet())); ################################################################################################################################ # Create the thread group that will be used for parallel processing @@ -207,11 +206,11 @@ eval ################################################################################################################################ # RESTORE ################################################################################################################################ - if (operationTest(OP_RESTORE)) + if (commandTest(CMD_RESTORE)) { if (optionRemoteTypeTest(DB)) { - confess &log(ASSERT, 'restore operation must be performed locally on the db server'); + confess &log(ASSERT, 'restore command must be performed locally on the db server'); } # Do the restore @@ -241,16 +240,16 @@ eval ################################################################################################################################ # GET MORE CONFIG INFO ################################################################################################################################ - # Make sure backup and expire operations happen on the backup side + # Make sure backup and expire command happen on the backup side if (optionRemoteTypeTest(BACKUP)) { - confess &log(ERROR, 'backup and expire operations must run on the backup host'); + confess &log(ERROR, 'backup and expire commands must run on the backup host'); } # Initialize the db object my $oDb; - if (operationTest(OP_BACKUP)) + if (commandTest(CMD_BACKUP)) { $oDb = new BackRest::Db ( @@ -261,7 +260,7 @@ eval optionGet(OPTION_DB_USER, optionTest(OPTION_DB_HOST)) ); - # Run backup_init - parameters required for backup and restore operations + # Run backup_init - parameters required for backup and restore commands backup_init ( $oDb, @@ -279,17 +278,17 @@ eval ################################################################################################################################ # BACKUP ################################################################################################################################ - if (operationTest(OP_BACKUP)) + if (commandTest(CMD_BACKUP)) { backup(optionGet(OPTION_DB_PATH), optionGet(OPTION_START_FAST)); - operationSet(OP_EXPIRE); + commandSet(CMD_EXPIRE); } ################################################################################################################################ # EXPIRE ################################################################################################################################ - if (operationTest(OP_EXPIRE)) + if (commandTest(CMD_EXPIRE)) { if (!defined($oDb)) { @@ -313,7 +312,7 @@ eval # Cleanup backup (should be removed when backup becomes an object) backup_cleanup(); - # Release the operation lock + # Release the command lock lockRelease(); safe_exit(0); diff --git a/lib/BackRest/Archive.pm b/lib/BackRest/Archive.pm index 8d468329a..cf78961d6 100644 --- a/lib/BackRest/Archive.pm +++ b/lib/BackRest/Archive.pm @@ -55,19 +55,19 @@ sub process my $self = shift; # Process push - if (operationTest(OP_ARCHIVE_PUSH)) + if (commandTest(CMD_ARCHIVE_PUSH)) { return $self->pushProcess(); } # Process get - if (operationTest(OP_ARCHIVE_GET)) + if (commandTest(CMD_ARCHIVE_GET)) { return $self->getProcess(); } - # Error if any other operation is found - confess &log(ASSERT, "Archive->process() called with invalid operation: " . operationGet()); + # Error if any other command is found + confess &log(ASSERT, "Archive->process() called with invalid command: " . commandGet()); } ################################################################################################################################ @@ -327,7 +327,6 @@ sub getCheck my $self = shift; my $oFile = shift; - # &log(DEBUG, OP_ARCHIVE_GET_CHECK . "()"); my $strArchiveId; if ($oFile->is_remote(PATH_BACKUP_ARCHIVE)) @@ -352,16 +351,16 @@ sub pushProcess { my $self = shift; - # Make sure the archive push operation happens on the db side + # Make sure the archive push command happens on the db side if (optionRemoteTypeTest(DB)) { - confess &log(ERROR, OP_ARCHIVE_PUSH . ' operation must run on the db host'); + confess &log(ERROR, CMD_ARCHIVE_PUSH . ' operation must run on the db host'); } # Load the archive object use BackRest::Archive; - # If an archive section has been defined, use that instead of the backup section when operation is OP_ARCHIVE_PUSH + # If an archive section has been defined, use that instead of the backup section when command is CMD_ARCHIVE_PUSH my $bArchiveAsync = optionGet(OPTION_ARCHIVE_ASYNC); my $strArchivePath = optionGet(OPTION_REPO_PATH); @@ -418,7 +417,7 @@ sub pushProcess } # Create a lock file to make sure async archive-push does not run more than once - if (!lockAcquire(operationGet(), false)) + if (!lockAcquire(commandGet(), false)) { &log(DEBUG, 'another async archive-push process is already running - exiting'); return 0; @@ -735,7 +734,7 @@ sub xfer unlink($strArchiveFile) or confess &log(ERROR, "copied ${strArchiveFile} to archive successfully but unable to remove it locally. " . 'This file will need to be cleaned up manually. If the problem persists, check if ' . - OP_ARCHIVE_PUSH . ' is being run with different permissions in different contexts.'); + CMD_ARCHIVE_PUSH . ' is being run with different permissions in different contexts.'); # Remove the copied segment from the total size $lFileSize -= $oManifestHash{name}{$strFile}{size}; diff --git a/lib/BackRest/Config.pm b/lib/BackRest/Config.pm index 4ab94aaca..88c2f7085 100644 --- a/lib/BackRest/Config.pm +++ b/lib/BackRest/Config.pm @@ -21,8 +21,8 @@ use BackRest::Utility; #################################################################################################################################### # Export functions #################################################################################################################################### -our @EXPORT = qw(configLoad optionGet optionTest optionRuleGet optionRequired optionDefault operationGet operationTest - operationSet operationWrite optionRemoteType optionRemoteTypeTest protocolGet optionRemoteTest +our @EXPORT = qw(configLoad optionGet optionTest optionRuleGet optionRequired optionDefault commandGet commandTest + commandSet commandWrite optionRemoteType optionRemoteTypeTest protocolGet optionRemoteTest protocolDestroy); #################################################################################################################################### @@ -38,22 +38,22 @@ use constant push @EXPORT, qw(DB BACKUP NONE); #################################################################################################################################### -# Operation constants - basic operations that are allowed in backrest +# Command constants - basic commands that are allowed in backrest #################################################################################################################################### -use constant OP_ARCHIVE_GET => 'archive-get'; - push @EXPORT, qw(OP_ARCHIVE_GET); -use constant OP_ARCHIVE_PUSH => 'archive-push'; - push @EXPORT, qw(OP_ARCHIVE_PUSH); -use constant OP_BACKUP => 'backup'; - push @EXPORT, qw(OP_BACKUP); -use constant OP_INFO => 'info'; - push @EXPORT, qw(OP_INFO); -use constant OP_REMOTE => 'remote'; - push @EXPORT, qw(OP_REMOTE); -use constant OP_RESTORE => 'restore'; - push @EXPORT, qw(OP_RESTORE); -use constant OP_EXPIRE => 'expire'; - push @EXPORT, qw(OP_EXPIRE); +use constant CMD_ARCHIVE_GET => 'archive-get'; + push @EXPORT, qw(CMD_ARCHIVE_GET); +use constant CMD_ARCHIVE_PUSH => 'archive-push'; + push @EXPORT, qw(CMD_ARCHIVE_PUSH); +use constant CMD_BACKUP => 'backup'; + push @EXPORT, qw(CMD_BACKUP); +use constant CMD_INFO => 'info'; + push @EXPORT, qw(CMD_INFO); +use constant CMD_REMOTE => 'remote'; + push @EXPORT, qw(CMD_REMOTE); +use constant CMD_RESTORE => 'restore'; + push @EXPORT, qw(CMD_RESTORE); +use constant CMD_EXPIRE => 'expire'; + push @EXPORT, qw(CMD_EXPIRE); #################################################################################################################################### # BACKUP Type Constants @@ -305,7 +305,7 @@ use constant OPTION_RULE_DEPEND_VALUE => 'depend-value', OPTION_RULE_HINT => 'hint', OPTION_RULE_NEGATE => 'negate', - OPTION_RULE_OPERATION => 'operation', + OPTION_RULE_COMMAND => 'command', OPTION_RULE_REQUIRED => 'required', OPTION_RULE_SECTION => 'section', OPTION_RULE_SECTION_INHERIT => 'section-inherit', @@ -313,7 +313,7 @@ use constant }; push @EXPORT, qw(OPTION_RULE_ALLOW_LIST OPTION_RULE_ALLOW_RANGE OPTION_RULE_DEFAULT OPTION_RULE_DEPEND OPTION_RULE_DEPEND_OPTION - OPTION_RULE_DEPEND_LIST OPTION_RULE_DEPEND_VALUE OPTION_RULE_NEGATE OPTION_RULE_OPERATION OPTION_RULE_REQUIRED + OPTION_RULE_DEPEND_LIST OPTION_RULE_DEPEND_VALUE OPTION_RULE_NEGATE OPTION_RULE_COMMAND OPTION_RULE_REQUIRED OPTION_RULE_SECTION OPTION_RULE_SECTION_INHERIT OPTION_RULE_TYPE); #################################################################################################################################### @@ -347,9 +347,9 @@ my %oOptionRule = &OPTION_DELTA => { &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RESTORE_DELTA, } @@ -359,14 +359,14 @@ my %oOptionRule = &OPTION_FORCE => { &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RESTORE_FORCE, }, - &OP_BACKUP => + &CMD_BACKUP => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_FORCE, &OPTION_RULE_DEPEND => @@ -381,9 +381,9 @@ my %oOptionRule = &OPTION_NO_START_STOP => { &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => + &CMD_BACKUP => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_NO_START_STOP } @@ -393,9 +393,9 @@ my %oOptionRule = &OPTION_SET => { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RESTORE_SET, } @@ -405,29 +405,29 @@ my %oOptionRule = &OPTION_STANZA => { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => + &CMD_ARCHIVE_GET => { &OPTION_RULE_REQUIRED => true }, - &OP_ARCHIVE_PUSH => + &CMD_ARCHIVE_PUSH => { &OPTION_RULE_REQUIRED => true }, - &OP_BACKUP => + &CMD_BACKUP => { &OPTION_RULE_REQUIRED => true }, - &OP_EXPIRE => + &CMD_EXPIRE => { &OPTION_RULE_REQUIRED => true }, - &OP_REMOTE => + &CMD_REMOTE => { &OPTION_RULE_REQUIRED => false }, - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_REQUIRED => true } @@ -437,9 +437,9 @@ my %oOptionRule = &OPTION_TARGET => { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_DEPEND => { @@ -458,9 +458,9 @@ my %oOptionRule = &OPTION_TARGET_EXCLUSIVE => { &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RESTORE_TARGET_EXCLUSIVE, &OPTION_RULE_DEPEND => @@ -479,9 +479,9 @@ my %oOptionRule = &OPTION_TARGET_RESUME => { &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RESTORE_TARGET_RESUME, &OPTION_RULE_DEPEND => @@ -501,9 +501,9 @@ my %oOptionRule = &OPTION_TARGET_TIMELINE => { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_REQUIRED => false, &OPTION_RULE_DEPEND => @@ -524,9 +524,9 @@ my %oOptionRule = &OPTION_TYPE => { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => + &CMD_BACKUP => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_TYPE, &OPTION_RULE_ALLOW_LIST => @@ -537,7 +537,7 @@ my %oOptionRule = } }, - &OP_RESTORE => + &CMD_RESTORE => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RESTORE_TYPE, &OPTION_RULE_ALLOW_LIST => @@ -556,9 +556,9 @@ my %oOptionRule = &OPTION_OUTPUT => { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_INFO => + &CMD_INFO => { &OPTION_RULE_DEFAULT => OPTION_DEFAULT_INFO_OUTPUT, &OPTION_RULE_ALLOW_LIST => @@ -577,13 +577,13 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_COMMAND_REMOTE, &OPTION_RULE_SECTION => CONFIG_SECTION_COMMAND, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_BACKUP => true, - &OP_INFO => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_BACKUP => true, + &CMD_INFO => true, + &CMD_RESTORE => true } }, @@ -592,9 +592,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_COMMAND_PSQL, &OPTION_RULE_SECTION => CONFIG_SECTION_COMMAND, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true } }, @@ -602,9 +602,9 @@ my %oOptionRule = { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_SECTION => CONFIG_SECTION_COMMAND, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true }, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_DEPEND => @@ -618,9 +618,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_ARCHIVE_ASYNC, &OPTION_RULE_SECTION => CONFIG_SECTION_ARCHIVE, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_PUSH => true + &CMD_ARCHIVE_PUSH => true } }, @@ -629,9 +629,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_STANZA, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true } }, @@ -639,9 +639,9 @@ my %oOptionRule = { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_SECTION => CONFIG_SECTION_STANZA, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true }, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_DEPEND => @@ -655,12 +655,12 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_BACKUP, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_INFO => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_INFO => true, + &CMD_RESTORE => true }, }, @@ -668,12 +668,12 @@ my %oOptionRule = { &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_SECTION => CONFIG_SECTION_BACKUP, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_INFO => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_INFO => true, + &CMD_RESTORE => true }, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_DEPEND => @@ -687,14 +687,14 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_REPO_PATH, &OPTION_RULE_SECTION => CONFIG_SECTION_GENERAL, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_BACKUP => true, - &OP_INFO => true, - &OP_RESTORE => true, - &OP_EXPIRE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_BACKUP => true, + &CMD_INFO => true, + &CMD_RESTORE => true, + &CMD_EXPIRE => true }, }, @@ -703,13 +703,13 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_GENERAL, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_INFO => true, - &OP_REMOTE => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_INFO => true, + &CMD_REMOTE => true, + &CMD_RESTORE => true }, }, @@ -718,17 +718,17 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_STRING, &OPTION_RULE_SECTION => CONFIG_SECTION_STANZA, &OPTION_RULE_HINT => "Does this stanza exist?", - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => + &CMD_ARCHIVE_GET => { &OPTION_RULE_REQUIRED => false }, - &OP_ARCHIVE_PUSH => + &CMD_ARCHIVE_PUSH => { &OPTION_RULE_REQUIRED => false }, - &OP_BACKUP => true + &CMD_BACKUP => true }, }, @@ -746,9 +746,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_INTEGER, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_ARCHIVE, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_PUSH => true + &CMD_ARCHIVE_PUSH => true } }, @@ -757,9 +757,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_ARCHIVE_CHECK, &OPTION_RULE_SECTION => true, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => + &CMD_BACKUP => { &OPTION_RULE_DEPEND => { @@ -775,9 +775,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_ARCHIVE_COPY, &OPTION_RULE_SECTION => true, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => + &CMD_BACKUP => { &OPTION_RULE_DEPEND => { @@ -794,12 +794,12 @@ my %oOptionRule = &OPTION_RULE_DEFAULT => OPTION_DEFAULT_COMPRESS, &OPTION_RULE_SECTION => true, &OPTION_RULE_SECTION_INHERIT => CONFIG_SECTION_GENERAL, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_BACKUP => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_BACKUP => true, + &CMD_RESTORE => true } }, @@ -810,14 +810,14 @@ my %oOptionRule = &OPTION_RULE_SECTION => true, &OPTION_RULE_SECTION_INHERIT => CONFIG_SECTION_GENERAL, &OPTION_RULE_ALLOW_RANGE => [OPTION_DEFAULT_COMPRESS_LEVEL_MIN, OPTION_DEFAULT_COMPRESS_LEVEL_MAX], - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_BACKUP => true, - &OP_INFO => true, - &OP_REMOTE => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_BACKUP => true, + &CMD_INFO => true, + &CMD_REMOTE => true, + &CMD_RESTORE => true } }, @@ -828,14 +828,14 @@ my %oOptionRule = &OPTION_RULE_SECTION => true, &OPTION_RULE_SECTION_INHERIT => CONFIG_SECTION_GENERAL, &OPTION_RULE_ALLOW_RANGE => [OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK_MIN, OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK_MAX], - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_BACKUP => true, - &OP_INFO => true, - &OP_REMOTE => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_BACKUP => true, + &CMD_INFO => true, + &CMD_REMOTE => true, + &CMD_RESTORE => true } }, @@ -844,9 +844,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_HARDLINK, &OPTION_RULE_SECTION => true, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true } }, @@ -864,14 +864,14 @@ my %oOptionRule = lc(DEBUG) => true, lc(TRACE) => true }, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_BACKUP => true, - &OP_EXPIRE => true, - &OP_INFO => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_BACKUP => true, + &CMD_EXPIRE => true, + &CMD_INFO => true, + &CMD_RESTORE => true } }, @@ -889,14 +889,14 @@ my %oOptionRule = lc(DEBUG) => true, lc(TRACE) => true }, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_ARCHIVE_GET => true, - &OP_ARCHIVE_PUSH => true, - &OP_BACKUP => true, - &OP_EXPIRE => true, - &OP_INFO => true, - &OP_RESTORE => true + &CMD_ARCHIVE_GET => true, + &CMD_ARCHIVE_PUSH => true, + &CMD_BACKUP => true, + &CMD_EXPIRE => true, + &CMD_INFO => true, + &CMD_RESTORE => true } }, @@ -905,9 +905,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RESTORE_TABLESPACE, &OPTION_RULE_SECTION => true, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => true + &CMD_RESTORE => true } }, @@ -916,9 +916,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_HASH, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_RESTORE_TABLESPACE_MAP, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => 1 + &CMD_RESTORE => 1 }, }, @@ -927,9 +927,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_HASH, &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_RESTORE_RECOVERY_SETTING, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_RESTORE => 1 + &CMD_RESTORE => 1 }, &OPTION_RULE_DEPEND => { @@ -950,10 +950,10 @@ my %oOptionRule = &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_EXPIRE, &OPTION_RULE_ALLOW_RANGE => [OPTION_DEFAULT_RETENTION_MIN, OPTION_DEFAULT_RETENTION_MAX], - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true, - &OP_EXPIRE => true + &CMD_BACKUP => true, + &CMD_EXPIRE => true } }, @@ -963,10 +963,10 @@ my %oOptionRule = &OPTION_RULE_REQUIRED => true, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_RETENTION_ARCHIVE_TYPE, &OPTION_RULE_SECTION => CONFIG_SECTION_EXPIRE, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true, - &OP_EXPIRE => true + &CMD_BACKUP => true, + &CMD_EXPIRE => true }, &OPTION_RULE_ALLOW_LIST => { @@ -986,10 +986,10 @@ my %oOptionRule = &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_EXPIRE, &OPTION_RULE_ALLOW_RANGE => [OPTION_DEFAULT_RETENTION_MIN, OPTION_DEFAULT_RETENTION_MAX], - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true, - &OP_EXPIRE => true + &CMD_BACKUP => true, + &CMD_EXPIRE => true } }, @@ -999,10 +999,10 @@ my %oOptionRule = &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => CONFIG_SECTION_EXPIRE, &OPTION_RULE_ALLOW_RANGE => [OPTION_DEFAULT_RETENTION_MIN, OPTION_DEFAULT_RETENTION_MAX], - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true, - &OP_EXPIRE => true + &CMD_BACKUP => true, + &CMD_EXPIRE => true } }, @@ -1011,9 +1011,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_INTEGER, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_MANIFEST_SAVE_THRESHOLD, &OPTION_RULE_SECTION => true, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true } }, @@ -1022,9 +1022,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_RESUME, &OPTION_RULE_SECTION => true, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true } }, @@ -1033,9 +1033,9 @@ my %oOptionRule = &OPTION_RULE_TYPE => OPTION_TYPE_BOOLEAN, &OPTION_RULE_DEFAULT => OPTION_DEFAULT_BACKUP_START_FAST, &OPTION_RULE_SECTION => true, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true + &CMD_BACKUP => true } }, @@ -1045,10 +1045,10 @@ my %oOptionRule = &OPTION_RULE_DEFAULT => OPTION_DEFAULT_THREAD_MAX, &OPTION_RULE_SECTION => true, &OPTION_RULE_SECTION_INHERIT => CONFIG_SECTION_GENERAL, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true, - &OP_RESTORE => true + &CMD_BACKUP => true, + &CMD_RESTORE => true } }, @@ -1058,10 +1058,10 @@ my %oOptionRule = &OPTION_RULE_REQUIRED => false, &OPTION_RULE_SECTION => true, &OPTION_RULE_SECTION_INHERIT => CONFIG_SECTION_GENERAL, - &OPTION_RULE_OPERATION => + &OPTION_RULE_COMMAND => { - &OP_BACKUP => true, - &OP_RESTORE => true + &CMD_BACKUP => true, + &CMD_RESTORE => true } }, @@ -1099,7 +1099,7 @@ my %oOptionRule = # Global variables #################################################################################################################################### my %oOption; # Option hash -my $strOperation; # Operation (backup, archive-get, ...) +my $strCommand; # Command (backup, archive-get, ...) my $strRemoteType; # Remote type (DB, BACKUP, NONE) my $oProtocol; # Global remote object that is created on first request (NOT THREADSAFE!) @@ -1220,41 +1220,41 @@ sub configLoad #################################################################################################################################### # optionValid # -# Make sure the command-line options are valid based on the operation. +# Make sure the command-line options are valid based on the command. #################################################################################################################################### sub optionValid { my $oOptionTest = shift; - # Check that the operation is present and valid - $strOperation = $ARGV[0]; + # Check that the command is present and valid + $strCommand = $ARGV[0]; - if (!defined($strOperation)) + if (!defined($strCommand)) { - confess &log(ERROR, "operation must be specified", ERROR_OPERATION_REQUIRED); + confess &log(ERROR, "command must be specified", ERROR_COMMAND_REQUIRED); } - if ($strOperation ne OP_ARCHIVE_GET && - $strOperation ne OP_ARCHIVE_PUSH && - $strOperation ne OP_BACKUP && - $strOperation ne OP_INFO && - $strOperation ne OP_REMOTE && - $strOperation ne OP_RESTORE && - $strOperation ne OP_EXPIRE) + if ($strCommand ne CMD_ARCHIVE_GET && + $strCommand ne CMD_ARCHIVE_PUSH && + $strCommand ne CMD_BACKUP && + $strCommand ne CMD_INFO && + $strCommand ne CMD_REMOTE && + $strCommand ne CMD_RESTORE && + $strCommand ne CMD_EXPIRE) { - confess &log(ERROR, "invalid operation ${strOperation}", ERROR_OPERATION_INVALID); + confess &log(ERROR, "invalid command ${strCommand}", ERROR_COMMAND_INVALID); } - # Set the operation section - because of the various archive commands this is not always the operation - my $strOperationSection; + # Set the command section - because of the various archive commands this is not always the command + my $strCommandSection; - if (operationTest(OP_ARCHIVE_GET) || operationTest(OP_ARCHIVE_PUSH)) + if (commandTest(CMD_ARCHIVE_GET) || commandTest(CMD_ARCHIVE_PUSH)) { - $strOperationSection = CONFIG_SECTION_ARCHIVE; + $strCommandSection = CONFIG_SECTION_ARCHIVE; } else { - $strOperationSection = $strOperation; + $strCommandSection = $strCommand; } # Hash to store contents of the config file. The file will be loaded one the config dependency is resolved unless all options @@ -1301,13 +1301,13 @@ sub optionValid } } - # If the operation has rules store them for later evaluation - my $oOperationRule = optionOperationRule($strOption, $strOperation); + # If the command has rules store them for later evaluation + my $oCommandRule = optionCommandRule($strOption, $strCommand); - # Check dependency for the operation then for the option + # Check dependency for the command then for the option my $bDependResolved = true; - my $oDepend = defined($oOperationRule) ? $$oOperationRule{&OPTION_RULE_DEPEND} : - $oOptionRule{$strOption}{&OPTION_RULE_DEPEND}; + my $oDepend = defined($oCommandRule) ? $$oCommandRule{&OPTION_RULE_DEPEND} : + $oOptionRule{$strOption}{&OPTION_RULE_DEPEND}; my $strDependOption; my $strDependValue; my $strDependType; @@ -1382,7 +1382,7 @@ sub optionValid # Get the section that the value should be in my $strSection = defined($oOptionRule{$strOption}{&OPTION_RULE_SECTION}) ? ($oOptionRule{$strOption}{&OPTION_RULE_SECTION} eq '1' ? - $strOperationSection : $oOptionRule{$strOption}{&OPTION_RULE_SECTION}) : undef; + $strCommandSection : $oOptionRule{$strOption}{&OPTION_RULE_SECTION}) : undef; # Only look in the stanza section when $strSection = true if ($strSection eq CONFIG_SECTION_STANZA) @@ -1533,17 +1533,17 @@ sub optionValid or confess &log(ERROR, "'${strValue}' is not valid for '${strOption}' option", ERROR_OPTION_INVALID_VALUE); } - # Process an allow list for the operation then for the option - my $oAllow = defined($oOperationRule) ? $$oOperationRule{&OPTION_RULE_ALLOW_LIST} : - $oOptionRule{$strOption}{&OPTION_RULE_ALLOW_LIST}; + # Process an allow list for the command then for the option + my $oAllow = defined($oCommandRule) ? $$oCommandRule{&OPTION_RULE_ALLOW_LIST} : + $oOptionRule{$strOption}{&OPTION_RULE_ALLOW_LIST}; if (defined($oAllow) && !defined($$oAllow{$strValue})) { confess &log(ERROR, "'${strValue}' is not valid for '${strOption}' option", ERROR_OPTION_INVALID_VALUE); } - # Process an allow range for the operation then for the option - $oAllow = defined($oOperationRule) ? $$oOperationRule{&OPTION_RULE_ALLOW_RANGE} : + # Process an allow range for the command then for the option + $oAllow = defined($oCommandRule) ? $$oCommandRule{&OPTION_RULE_ALLOW_RANGE} : $oOptionRule{$strOption}{&OPTION_RULE_ALLOW_RANGE}; if (defined($oAllow) && ($strValue < $$oAllow[0] || $strValue > $$oAllow[1])) @@ -1590,14 +1590,14 @@ sub optionValid } # Else try to set a default elsif ($bDependResolved && - (!defined($oOptionRule{$strOption}{&OPTION_RULE_OPERATION}) || - defined($oOptionRule{$strOption}{&OPTION_RULE_OPERATION}{$strOperation}))) + (!defined($oOptionRule{$strOption}{&OPTION_RULE_COMMAND}) || + defined($oOptionRule{$strOption}{&OPTION_RULE_COMMAND}{$strCommand}))) { # Source is default for this option $oOption{$strOption}{source} = SOURCE_DEFAULT; - # Check for default in operation then option - my $strDefault = optionDefault($strOption, $strOperation); + # Check for default in command then option + my $strDefault = optionDefault($strOption, $strCommand); # If default is defined if (defined($strDefault)) @@ -1606,9 +1606,9 @@ sub optionValid $oOption{$strOption}{value} = $strDefault if !$bNegate; } # Else check required - elsif (optionRequired($strOption, $strOperation)) + elsif (optionRequired($strOption, $strCommand)) { - confess &log(ERROR, "${strOperation} operation requires option: ${strOption}" . + confess &log(ERROR, "${strCommand} command requires option: ${strOption}" . (defined($oOptionRule{$strOption}{&OPTION_RULE_HINT}) ? "\nHINT: " . $oOptionRule{$strOption}{&OPTION_RULE_HINT} : ''), ERROR_OPTION_REQUIRED); @@ -1621,21 +1621,21 @@ sub optionValid } #################################################################################################################################### -# optionOperationRule +# optionCommandRule # -# Returns the option rules based on the operation. +# Returns the option rules based on the command. #################################################################################################################################### -sub optionOperationRule +sub optionCommandRule { my $strOption = shift; - my $strOperation = shift; + my $strCommand = shift; - if (defined($strOperation)) + if (defined($strCommand)) { - return defined($oOptionRule{$strOption}{&OPTION_RULE_OPERATION}) && - defined($oOptionRule{$strOption}{&OPTION_RULE_OPERATION}{$strOperation}) && - ref($oOptionRule{$strOption}{&OPTION_RULE_OPERATION}{$strOperation}) eq 'HASH' ? - $oOptionRule{$strOption}{&OPTION_RULE_OPERATION}{$strOperation} : undef; + return defined($oOptionRule{$strOption}{&OPTION_RULE_COMMAND}) && + defined($oOptionRule{$strOption}{&OPTION_RULE_COMMAND}{$strCommand}) && + ref($oOptionRule{$strOption}{&OPTION_RULE_COMMAND}{$strCommand}) eq 'HASH' ? + $oOptionRule{$strOption}{&OPTION_RULE_COMMAND}{$strCommand} : undef; } return undef; @@ -1644,19 +1644,19 @@ sub optionOperationRule #################################################################################################################################### # optionRequired # -# Is the option required for this operation? +# Is the option required for this command? #################################################################################################################################### sub optionRequired { my $strOption = shift; - my $strOperation = shift; + my $strCommand = shift; - # Get the operation rule - my $oOperationRule = optionOperationRule($strOption, $strOperation); + # Get the command rule + my $oCommandRule = optionCommandRule($strOption, $strCommand); - # Check for required in operation then option - my $bRequired = defined($oOperationRule) ? $$oOperationRule{&OPTION_RULE_REQUIRED} : - $oOptionRule{$strOption}{&OPTION_RULE_REQUIRED}; + # Check for required in command then option + my $bRequired = defined($oCommandRule) ? $$oCommandRule{&OPTION_RULE_REQUIRED} : + $oOptionRule{$strOption}{&OPTION_RULE_REQUIRED}; # Return required return !defined($bRequired) || $bRequired; @@ -1666,55 +1666,55 @@ sub optionRequired #################################################################################################################################### # optionDefault # -# Does the option have a default for this operation? +# Does the option have a default for this command? #################################################################################################################################### sub optionDefault { my $strOption = shift; - my $strOperation = shift; + my $strCommand = shift; - # Get the operation rule - my $oOperationRule = optionOperationRule($strOption, $strOperation); + # Get the command rule + my $oCommandRule = optionCommandRule($strOption, $strCommand); - # Check for default in operation - my $strDefault = defined($oOperationRule) ? $$oOperationRule{&OPTION_RULE_DEFAULT} : undef; + # Check for default in command + my $strDefault = defined($oCommandRule) ? $$oCommandRule{&OPTION_RULE_DEFAULT} : undef; # If defined return, else try to grab the global default return defined($strDefault) ? $strDefault : $oOptionRule{$strOption}{&OPTION_RULE_DEFAULT}; } #################################################################################################################################### -# operationGet +# commandGet # -# Get the current operation. +# Get the current command. #################################################################################################################################### -sub operationGet +sub commandGet { - return $strOperation; + return $strCommand; } #################################################################################################################################### -# operationTest +# commandTest # -# Test the current operation. +# Test the current command. #################################################################################################################################### -sub operationTest +sub commandTest { - my $strOperationTest = shift; + my $strCommandTest = shift; - return $strOperationTest eq $strOperation; + return $strCommandTest eq $strCommand; } #################################################################################################################################### -# operationSet +# commandSet # -# Set current operation (usually for triggering follow-on operations). +# Set current command (usually for triggering follow-on commands). #################################################################################################################################### -sub operationSet +sub commandSet { my $strValue = shift; - $strOperation = $strValue; + $strCommand = $strValue; } #################################################################################################################################### @@ -1736,25 +1736,25 @@ sub optionGet } #################################################################################################################################### -# operationWrite +# commandWrite # -# Using the options that were passed to the current operations, write the command string for another operation. For example, this +# Using the options that were passed to the current command, write the command string for another command. For example, this # can be used to write the archive-get command for recovery.conf during a restore. #################################################################################################################################### -sub operationWrite +sub commandWrite { - my $strNewOperation = shift; + my $strNewCommand = shift; my $bIncludeConfig = shift; - my $strCommand = shift; + my $strCommandString = shift; - $strCommand = defined($strCommand) ? $strCommand : abs_path($0); + $strCommandString = defined($strCommandString) ? $strCommandString : abs_path($0); # If config setting are included then also set --no-config $bIncludeConfig = defined($bIncludeConfig) ? $bIncludeConfig : false; if ($bIncludeConfig) { - $strCommand .= ' --no-config'; + $strCommandString .= ' --no-config'; } foreach my $strOption (sort(keys(%oOption))) @@ -1764,8 +1764,8 @@ sub operationWrite # &log(WARN, "option ${strOption} = " . (defined($oOption{$strOption}{source}) ? $oOption{$strOption}{source} : 'undef') . # ", " . (defined($oOption{$strOption}{value}) ? $oOption{$strOption}{value} : 'undef')); - if ((!defined($oOptionRule{$strOption}{&OPTION_RULE_OPERATION}) || - defined($oOptionRule{$strOption}{&OPTION_RULE_OPERATION}{$strNewOperation})) && + if ((!defined($oOptionRule{$strOption}{&OPTION_RULE_COMMAND}) || + defined($oOptionRule{$strOption}{&OPTION_RULE_COMMAND}{$strNewCommand})) && defined($oOption{$strOption}{value}) && ($bIncludeConfig ? $oOption{$strOption}{source} ne SOURCE_DEFAULT : $oOption{$strOption}{source} eq SOURCE_PARAM)) { @@ -1782,20 +1782,20 @@ sub operationWrite if (index($oOption{$strOption}{value}, " ") != -1) { - $strCommand .= " \"${strParam}\""; + $strCommandString .= " \"${strParam}\""; } else { - $strCommand .= " ${strParam}"; + $strCommandString .= " ${strParam}"; } } } - $strCommand .= " ${strNewOperation}"; + $strCommandString .= " ${strNewCommand}"; } #################################################################################################################################### -# commandWrite +# optionTest # # Test a option value. #################################################################################################################################### @@ -1853,8 +1853,8 @@ sub protocolGet ( undef, false, undef, optionGet(OPTION_BUFFER_SIZE), - operationTest(OP_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL : optionGet(OPTION_COMPRESS_LEVEL), - operationTest(OP_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK : optionGet(OPTION_COMPRESS_LEVEL_NETWORK) + commandTest(CMD_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL : optionGet(OPTION_COMPRESS_LEVEL), + commandTest(CMD_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK : optionGet(OPTION_COMPRESS_LEVEL_NETWORK) ); } @@ -1869,10 +1869,10 @@ sub protocolGet ( optionRemoteTypeTest(DB) ? optionGet(OPTION_DB_HOST) : optionGet(OPTION_BACKUP_HOST), optionRemoteTypeTest(DB) ? optionGet(OPTION_DB_USER) : optionGet(OPTION_BACKUP_USER), - operationWrite(OP_REMOTE, true, optionGet(OPTION_COMMAND_REMOTE)), + commandWrite(CMD_REMOTE, true, optionGet(OPTION_COMMAND_REMOTE)), optionGet(OPTION_BUFFER_SIZE), - operationTest(OP_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL : optionGet(OPTION_COMPRESS_LEVEL), - operationTest(OP_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK : optionGet(OPTION_COMPRESS_LEVEL_NETWORK) + commandTest(CMD_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL : optionGet(OPTION_COMPRESS_LEVEL), + commandTest(CMD_EXPIRE) ? OPTION_DEFAULT_COMPRESS_LEVEL_NETWORK : optionGet(OPTION_COMPRESS_LEVEL_NETWORK) ); if ($bStore) diff --git a/lib/BackRest/Exception.pm b/lib/BackRest/Exception.pm index 4a4644028..58cd50a6d 100644 --- a/lib/BackRest/Exception.pm +++ b/lib/BackRest/Exception.pm @@ -19,7 +19,7 @@ use constant ERROR_CONFIG => 102, ERROR_FILE_INVALID => 103, ERROR_FORMAT => 104, - ERROR_OPERATION_REQUIRED => 105, + ERROR_COMMAND_REQUIRED => 105, ERROR_OPTION_INVALID => 106, ERROR_OPTION_INVALID_VALUE => 107, ERROR_OPTION_INVALID_RANGE => 108, @@ -37,7 +37,7 @@ use constant ERROR_ARCHIVE_DUPLICATE => 120, ERROR_VERSION_NOT_SUPPORTED => 121, ERROR_PATH_CREATE => 122, - ERROR_OPERATION_INVALID => 123, + ERROR_COMMAND_INVALID => 123, ERROR_HOST_CONNECT => 124, ERROR_LOCK_ACQUIRE => 125, ERROR_BACKUP_MISMATCH => 126, @@ -48,11 +48,11 @@ use constant ERROR_UNKNOWN => 199 }; -our @EXPORT = qw(ERROR_ASSERT ERROR_CHECKSUM ERROR_CONFIG ERROR_FILE_INVALID ERROR_FORMAT ERROR_OPERATION_REQUIRED +our @EXPORT = qw(ERROR_ASSERT ERROR_CHECKSUM ERROR_CONFIG ERROR_FILE_INVALID ERROR_FORMAT ERROR_COMMAND_REQUIRED ERROR_OPTION_INVALID ERROR_OPTION_INVALID_VALUE ERROR_OPTION_INVALID_RANGE ERROR_OPTION_INVALID_PAIR ERROR_OPTION_DUPLICATE_KEY ERROR_OPTION_NEGATE ERROR_OPTION_REQUIRED ERROR_POSTMASTER_RUNNING ERROR_PROTOCOL ERROR_RESTORE_PATH_NOT_EMPTY ERROR_FILE_OPEN ERROR_FILE_READ ERROR_PARAM_REQUIRED ERROR_ARCHIVE_MISMATCH - ERROR_ARCHIVE_DUPLICATE ERROR_VERSION_NOT_SUPPORTED ERROR_PATH_CREATE ERROR_OPERATION_INVALID ERROR_HOST_CONNECT + ERROR_ARCHIVE_DUPLICATE ERROR_VERSION_NOT_SUPPORTED ERROR_PATH_CREATE ERROR_COMMAND_INVALID ERROR_HOST_CONNECT ERROR_UNKNOWN ERROR_LOCK_ACQUIRE ERROR_BACKUP_MISMATCH ERROR_FILE_SYNC ERROR_PATH_OPEN ERROR_PATH_SYNC); #################################################################################################################################### diff --git a/lib/BackRest/Info.pm b/lib/BackRest/Info.pm index dabf947d0..a50031b8a 100644 --- a/lib/BackRest/Info.pm +++ b/lib/BackRest/Info.pm @@ -184,7 +184,7 @@ sub listStanza } else { - my @stryStanza = $oFile->list(PATH_BACKUP, OP_BACKUP, undef, undef, true); + my @stryStanza = $oFile->list(PATH_BACKUP, CMD_BACKUP, undef, undef, true); foreach my $strStanzaFound (@stryStanza) { @@ -250,7 +250,7 @@ sub listBackup my $strStanza = shift; # Load or build backup.info - my $oBackupInfo = new BackRest::BackupInfo($oFile->path_get(PATH_BACKUP, OP_BACKUP . "/${strStanza}")); + my $oBackupInfo = new BackRest::BackupInfo($oFile->path_get(PATH_BACKUP, CMD_BACKUP . "/${strStanza}")); # Build the db list my @oyDbList; diff --git a/lib/BackRest/Remote.pm b/lib/BackRest/Remote.pm index 6bb6d0ebc..4110641fa 100644 --- a/lib/BackRest/Remote.pm +++ b/lib/BackRest/Remote.pm @@ -29,9 +29,9 @@ use BackRest::Utility; #################################################################################################################################### # Operation constants #################################################################################################################################### -use constant OP_REMOTE_BASE => 'Remote'; +use constant OP_REMOTE => 'Remote'; -use constant OP_REMOTE_NEW => OP_REMOTE_BASE . "->new"; +use constant OP_REMOTE_NEW => OP_REMOTE . "->new"; #################################################################################################################################### # Operation constants @@ -61,7 +61,7 @@ sub new defined($strHost) ? DEBUG : TRACE); # Init object and store variables - my $self = $class->SUPER::new(OP_REMOTE, !defined($strHost), $strCommand, $iBlockSize, $iCompressLevel, $iCompressLevelNetwork, + my $self = $class->SUPER::new(CMD_REMOTE, !defined($strHost), $strCommand, $iBlockSize, $iCompressLevel, $iCompressLevelNetwork, $strHost, $strUser); return $self; diff --git a/lib/BackRest/Restore.pm b/lib/BackRest/Restore.pm index e9c225276..0798f9f9e 100644 --- a/lib/BackRest/Restore.pm +++ b/lib/BackRest/Restore.pm @@ -536,7 +536,7 @@ sub recovery # Write the restore command if (!$bRestoreCommandOverride) { - $strRecovery .= "restore_command = '" . operationWrite(OP_ARCHIVE_GET) . " %f \"%p\"'\n"; + $strRecovery .= "restore_command = '" . commandWrite(CMD_ARCHIVE_GET) . " %f \"%p\"'\n"; } # If RECOVERY_TYPE_DEFAULT do not write target options diff --git a/test/lib/BackRestTest/ConfigTest.pm b/test/lib/BackRestTest/ConfigTest.pm index 874b7bf12..09b89e157 100755 --- a/test/lib/BackRestTest/ConfigTest.pm +++ b/test/lib/BackRestTest/ConfigTest.pm @@ -46,12 +46,12 @@ sub optionSetBoolTest $$oOption{boolean}{$strKey} = defined($bValue) ? $bValue : true; } -sub operationSetTest +sub commandSetTest { my $oOption = shift; - my $strOperation = shift; + my $strCommand = shift; - $$oOption{operation} = $strOperation; + $$oOption{command} = $strCommand; } sub optionRemoveTest @@ -92,7 +92,7 @@ sub argvWriteTest } } - $ARGV[@ARGV] = $$oOption{operation}; + $ARGV[@ARGV] = $$oOption{command}; &log(INFO, " command line: " . join(" ", @ARGV)); @@ -102,7 +102,7 @@ sub argvWriteTest sub configLoadExpect { my $oOption = shift; - my $strOperation = shift; + my $strCommand = shift; my $iExpectedError = shift; my $strErrorParam1 = shift; my $strErrorParam2 = shift; @@ -110,7 +110,7 @@ sub configLoadExpect my $oOptionRuleExpected = optionRuleGet(); - operationSetTest($oOption, $strOperation); + commandSetTest($oOption, $strCommand); argvWriteTest($oOption); eval @@ -139,12 +139,12 @@ sub configLoadExpect if ($iExpectedError == ERROR_OPTION_REQUIRED) { - $strError = "${strOperation} operation requires option: ${strErrorParam1}" . + $strError = "${strCommand} command requires option: ${strErrorParam1}" . (defined($strErrorParam2) ? "\nHINT: ${strErrorParam2}" : ''); } - elsif ($iExpectedError == ERROR_OPERATION_REQUIRED) + elsif ($iExpectedError == ERROR_COMMAND_REQUIRED) { - $strError = "operation must be specified"; + $strError = "command must be specified"; } elsif ($iExpectedError == ERROR_OPTION_INVALID) { @@ -272,14 +272,14 @@ sub BackRestTestConfig_Test { optionSetTest($oOption, OPTION_DB_PATH, '/db'); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_REQUIRED, OPTION_STANZA); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_REQUIRED, OPTION_STANZA); } if (BackRestTestCommon_Run(++$iRun, 'backup with boolean stanza')) { optionSetBoolTest($oOption, OPTION_STANZA); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPERATION_REQUIRED); + configLoadExpect($oOption, CMD_BACKUP, ERROR_COMMAND_REQUIRED); } if (BackRestTestCommon_Run(++$iRun, 'backup type defaults to ' . BACKUP_TYPE_INCR)) @@ -287,7 +287,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_TYPE, BACKUP_TYPE_INCR); } @@ -297,7 +297,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_TYPE, BACKUP_TYPE_FULL); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_TYPE, BACKUP_TYPE_FULL); } @@ -307,7 +307,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_TYPE, BOGUS); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_TYPE); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_TYPE); } if (BackRestTestCommon_Run(++$iRun, 'backup invalid force')) @@ -316,7 +316,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetBoolTest($oOption, OPTION_FORCE); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID, OPTION_FORCE, OPTION_NO_START_STOP); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID, OPTION_FORCE, OPTION_NO_START_STOP); } if (BackRestTestCommon_Run(++$iRun, 'backup valid force')) @@ -327,7 +327,7 @@ sub BackRestTestConfig_Test optionSetBoolTest($oOption, OPTION_NO_START_STOP); optionSetBoolTest($oOption, OPTION_FORCE); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_NO_START_STOP, true); optionTestExpect(OPTION_FORCE, true); } @@ -339,7 +339,7 @@ sub BackRestTestConfig_Test optionSetBoolTest($oOption, OPTION_TEST); optionSetTest($oOption, OPTION_TEST_DELAY, BOGUS); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_TEST_DELAY); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_TEST_DELAY); } if (BackRestTestCommon_Run(++$iRun, 'backup invalid ' . OPTION_TEST_DELAY)) @@ -348,7 +348,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_TEST_DELAY, 5); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID, OPTION_TEST_DELAY, OPTION_TEST); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID, OPTION_TEST_DELAY, OPTION_TEST); } if (BackRestTestCommon_Run(++$iRun, 'backup check ' . OPTION_TEST_DELAY . ' undef')) @@ -356,7 +356,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_TEST_DELAY); } @@ -367,7 +367,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_TARGET, BOGUS); @oyArray = (RECOVERY_TYPE_NAME, RECOVERY_TYPE_TIME, RECOVERY_TYPE_XID); - configLoadExpect($oOption, OP_RESTORE, ERROR_OPTION_INVALID, OPTION_TARGET, OPTION_TYPE, \@oyArray); + configLoadExpect($oOption, CMD_RESTORE, ERROR_OPTION_INVALID, OPTION_TARGET, OPTION_TYPE, \@oyArray); } if (BackRestTestCommon_Run(++$iRun, 'restore ' . OPTION_TARGET)) @@ -376,7 +376,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_TYPE, RECOVERY_TYPE_NAME); optionSetTest($oOption, OPTION_TARGET, BOGUS); - configLoadExpect($oOption, OP_RESTORE); + configLoadExpect($oOption, CMD_RESTORE); optionTestExpect(OPTION_TYPE, RECOVERY_TYPE_NAME); optionTestExpect(OPTION_TARGET, BOGUS); optionTestExpect(OPTION_TARGET_TIMELINE); @@ -388,7 +388,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_THREAD_MAX, BOGUS); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_THREAD_MAX); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_THREAD_MAX); } if (BackRestTestCommon_Run(++$iRun, 'invalid float ' . OPTION_THREAD_MAX)) @@ -397,7 +397,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_THREAD_MAX, '0.0'); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID_VALUE, '0.0', OPTION_THREAD_MAX); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID_VALUE, '0.0', OPTION_THREAD_MAX); } if (BackRestTestCommon_Run(++$iRun, 'valid ' . OPTION_THREAD_MAX)) @@ -406,7 +406,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_THREAD_MAX, '2'); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); } if (BackRestTestCommon_Run(++$iRun, 'valid float ' . OPTION_TEST_DELAY)) @@ -416,7 +416,7 @@ sub BackRestTestConfig_Test optionSetBoolTest($oOption, OPTION_TEST); optionSetTest($oOption, OPTION_TEST_DELAY, '0.25'); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); } if (BackRestTestCommon_Run(++$iRun, 'valid int ' . OPTION_TEST_DELAY)) @@ -426,7 +426,7 @@ sub BackRestTestConfig_Test optionSetBoolTest($oOption, OPTION_TEST); optionSetTest($oOption, OPTION_TEST_DELAY, 3); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); } if (BackRestTestCommon_Run(++$iRun, 'restore valid ' . OPTION_TARGET_TIMELINE)) @@ -434,7 +434,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_TARGET_TIMELINE, 2); - configLoadExpect($oOption, OP_RESTORE); + configLoadExpect($oOption, CMD_RESTORE); } if (BackRestTestCommon_Run(++$iRun, 'invalid ' . OPTION_BUFFER_SIZE)) @@ -442,85 +442,85 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_BUFFER_SIZE, '512'); - configLoadExpect($oOption, OP_RESTORE, ERROR_OPTION_INVALID_RANGE, '512', OPTION_BUFFER_SIZE); + configLoadExpect($oOption, CMD_RESTORE, ERROR_OPTION_INVALID_RANGE, '512', OPTION_BUFFER_SIZE); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' invalid option ' . OPTION_RETENTION_ARCHIVE_TYPE)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' invalid option ' . OPTION_RETENTION_ARCHIVE_TYPE)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_RETENTION_ARCHIVE_TYPE, BOGUS); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID, OPTION_RETENTION_ARCHIVE_TYPE, OPTION_RETENTION_ARCHIVE); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID, OPTION_RETENTION_ARCHIVE_TYPE, OPTION_RETENTION_ARCHIVE); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' invalid value ' . OPTION_RETENTION_ARCHIVE_TYPE)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' invalid value ' . OPTION_RETENTION_ARCHIVE_TYPE)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_RETENTION_ARCHIVE, 3); optionSetTest($oOption, OPTION_RETENTION_ARCHIVE_TYPE, BOGUS); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_RETENTION_ARCHIVE_TYPE); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_RETENTION_ARCHIVE_TYPE); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' valid value ' . OPTION_RETENTION_ARCHIVE_TYPE)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' valid value ' . OPTION_RETENTION_ARCHIVE_TYPE)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_RETENTION_ARCHIVE, 1); optionSetTest($oOption, OPTION_RETENTION_ARCHIVE_TYPE, BACKUP_TYPE_FULL); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_RETENTION_ARCHIVE, 1); optionTestExpect(OPTION_RETENTION_ARCHIVE_TYPE, BACKUP_TYPE_FULL); } - if (BackRestTestCommon_Run(++$iRun, OP_RESTORE . ' invalid value ' . OPTION_RESTORE_RECOVERY_SETTING)) + if (BackRestTestCommon_Run(++$iRun, CMD_RESTORE . ' invalid value ' . OPTION_RESTORE_RECOVERY_SETTING)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_RESTORE_RECOVERY_SETTING, '='); - configLoadExpect($oOption, OP_RESTORE, ERROR_OPTION_INVALID_PAIR, '=', OPTION_RESTORE_RECOVERY_SETTING); + configLoadExpect($oOption, CMD_RESTORE, ERROR_OPTION_INVALID_PAIR, '=', OPTION_RESTORE_RECOVERY_SETTING); } - if (BackRestTestCommon_Run(++$iRun, OP_RESTORE . ' invalid value ' . OPTION_RESTORE_RECOVERY_SETTING)) + if (BackRestTestCommon_Run(++$iRun, CMD_RESTORE . ' invalid value ' . OPTION_RESTORE_RECOVERY_SETTING)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_RESTORE_RECOVERY_SETTING, '=' . BOGUS); - configLoadExpect($oOption, OP_RESTORE, ERROR_OPTION_INVALID_PAIR, '=' . BOGUS, OPTION_RESTORE_RECOVERY_SETTING); + configLoadExpect($oOption, CMD_RESTORE, ERROR_OPTION_INVALID_PAIR, '=' . BOGUS, OPTION_RESTORE_RECOVERY_SETTING); } - if (BackRestTestCommon_Run(++$iRun, OP_RESTORE . ' invalid value ' . OPTION_RESTORE_RECOVERY_SETTING)) + if (BackRestTestCommon_Run(++$iRun, CMD_RESTORE . ' invalid value ' . OPTION_RESTORE_RECOVERY_SETTING)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_RESTORE_RECOVERY_SETTING, BOGUS . '='); - configLoadExpect($oOption, OP_RESTORE, ERROR_OPTION_INVALID_PAIR, BOGUS . '=', OPTION_RESTORE_RECOVERY_SETTING); + configLoadExpect($oOption, CMD_RESTORE, ERROR_OPTION_INVALID_PAIR, BOGUS . '=', OPTION_RESTORE_RECOVERY_SETTING); } - if (BackRestTestCommon_Run(++$iRun, OP_RESTORE . ' valid value ' . OPTION_RESTORE_RECOVERY_SETTING)) + if (BackRestTestCommon_Run(++$iRun, CMD_RESTORE . ' valid value ' . OPTION_RESTORE_RECOVERY_SETTING)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_RESTORE_RECOVERY_SETTING, 'primary-conn-info=db.domain.net'); - configLoadExpect($oOption, OP_RESTORE); + configLoadExpect($oOption, CMD_RESTORE); optionTestExpect(OPTION_RESTORE_RECOVERY_SETTING, 'db.domain.net', 'primary-conn-info'); } - if (BackRestTestCommon_Run(++$iRun, OP_RESTORE . ' values passed to ' . OP_ARCHIVE_GET)) + if (BackRestTestCommon_Run(++$iRun, CMD_RESTORE . ' values passed to ' . CMD_ARCHIVE_GET)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db path/main'); optionSetTest($oOption, OPTION_REPO_PATH, '/repo'); optionSetTest($oOption, OPTION_BACKUP_HOST, 'db.mydomain.com'); - configLoadExpect($oOption, OP_RESTORE); + configLoadExpect($oOption, CMD_RESTORE); - my $strCommand = operationWrite(OP_ARCHIVE_GET); + my $strCommand = commandWrite(CMD_ARCHIVE_GET); my $strExpectedCommand = abs_path($0) . " --backup-host=db.mydomain.com \"--db-path=/db path/main\"" . - " --repo-path=/repo --repo-remote-path=/repo --stanza=main " . OP_ARCHIVE_GET; + " --repo-path=/repo --repo-remote-path=/repo --stanza=main " . CMD_ARCHIVE_GET; if ($strCommand ne $strExpectedCommand) { @@ -528,33 +528,33 @@ sub BackRestTestConfig_Test } } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' valid value ' . OPTION_COMMAND_PSQL)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' valid value ' . OPTION_COMMAND_PSQL)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_COMMAND_PSQL, '/psql -X %option%'); optionSetTest($oOption, OPTION_COMMAND_PSQL_OPTION, '--port 5432'); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_COMMAND_PSQL, '/psql -X --port 5432'); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' default value ' . OPTION_COMMAND_REMOTE)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' default value ' . OPTION_COMMAND_REMOTE)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_COMMAND_PSQL, '/psql -X %option%'); optionSetTest($oOption, OPTION_COMMAND_PSQL_OPTION, '--port 5432'); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_COMMAND_REMOTE, abs_path($0)); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' missing option ' . OPTION_DB_PATH)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' missing option ' . OPTION_DB_PATH)) { optionSetTest($oOption, OPTION_STANZA, $strStanza); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_REQUIRED, OPTION_DB_PATH, 'Does this stanza exist?'); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_REQUIRED, OPTION_DB_PATH, 'Does this stanza exist?'); } } @@ -575,7 +575,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_CONFIG, '/dude/dude.conf'); optionSetBoolTest($oOption, OPTION_CONFIG, false); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_NEGATE, OPTION_CONFIG); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_NEGATE, OPTION_CONFIG); } if (BackRestTestCommon_Run(++$iRun, 'option ' . OPTION_CONFIG)) @@ -584,7 +584,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetBoolTest($oOption, OPTION_CONFIG, false); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_CONFIG); } @@ -593,7 +593,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_CONFIG, OPTION_DEFAULT_CONFIG); } @@ -603,20 +603,20 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, BackRestTestCommon_TestPathGet()); - configLoadExpect($oOption, OP_BACKUP, ERROR_FILE_INVALID, BackRestTestCommon_TestPathGet()); + configLoadExpect($oOption, CMD_BACKUP, ERROR_FILE_INVALID, BackRestTestCommon_TestPathGet()); } if (BackRestTestCommon_Run(++$iRun, 'load from config stanza section - option ' . OPTION_THREAD_MAX)) { $oConfig = {}; - $$oConfig{"${strStanza}:" . &OP_BACKUP}{&OPTION_THREAD_MAX} = 2; + $$oConfig{"${strStanza}:" . &CMD_BACKUP}{&OPTION_THREAD_MAX} = 2; iniSave($strConfigFile, $oConfig, true); optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_THREAD_MAX, 2); } @@ -630,7 +630,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_THREAD_MAX, 3); } @@ -638,14 +638,14 @@ sub BackRestTestConfig_Test if (BackRestTestCommon_Run(++$iRun, 'load from config global section - option ' . OPTION_THREAD_MAX)) { $oConfig = {}; - $$oConfig{&CONFIG_GLOBAL . ':' . &OP_BACKUP}{&OPTION_THREAD_MAX} = 2; + $$oConfig{&CONFIG_GLOBAL . ':' . &CMD_BACKUP}{&OPTION_THREAD_MAX} = 2; iniSave($strConfigFile, $oConfig, true); optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_THREAD_MAX, 2); } @@ -659,7 +659,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_THREAD_MAX, 5); } @@ -672,7 +672,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_THREAD_MAX, 1); } @@ -687,21 +687,21 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_THREAD_MAX, 7); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_THREAD_MAX, 7); } if (BackRestTestCommon_Run(++$iRun, 'invalid boolean - option ' . OPTION_HARDLINK)) { $oConfig = {}; - $$oConfig{&CONFIG_GLOBAL . ':' . &OP_BACKUP}{&OPTION_HARDLINK} = 'Y'; + $$oConfig{&CONFIG_GLOBAL . ':' . &CMD_BACKUP}{&OPTION_HARDLINK} = 'Y'; iniSave($strConfigFile, $oConfig, true); optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID_VALUE, 'Y', OPTION_HARDLINK); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID_VALUE, 'Y', OPTION_HARDLINK); } if (BackRestTestCommon_Run(++$iRun, 'invalid value - option ' . OPTION_LOG_LEVEL_CONSOLE)) @@ -714,7 +714,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_LOG_LEVEL_CONSOLE); + configLoadExpect($oOption, CMD_BACKUP, ERROR_OPTION_INVALID_VALUE, BOGUS, OPTION_LOG_LEVEL_CONSOLE); } if (BackRestTestCommon_Run(++$iRun, 'valid value - option ' . OPTION_LOG_LEVEL_CONSOLE)) @@ -726,7 +726,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_RESTORE); + configLoadExpect($oOption, CMD_RESTORE); } if (BackRestTestCommon_Run(++$iRun, 'archive-push - option ' . OPTION_LOG_LEVEL_CONSOLE)) @@ -734,10 +734,10 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_ARCHIVE_PUSH); + configLoadExpect($oOption, CMD_ARCHIVE_PUSH); } - if (BackRestTestCommon_Run(++$iRun, OP_EXPIRE . ' ' . OPTION_RETENTION_FULL)) + if (BackRestTestCommon_Run(++$iRun, CMD_EXPIRE . ' ' . OPTION_RETENTION_FULL)) { $oConfig = {}; $$oConfig{&CONFIG_GLOBAL . ':' . &CONFIG_SECTION_EXPIRE}{&OPTION_RETENTION_FULL} = 2; @@ -746,11 +746,11 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_EXPIRE); + configLoadExpect($oOption, CMD_EXPIRE); optionTestExpect(OPTION_RETENTION_FULL, 2); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' option ' . OPTION_COMPRESS)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' option ' . OPTION_COMPRESS)) { $oConfig = {}; $$oConfig{&CONFIG_GLOBAL . ':' . &CONFIG_SECTION_BACKUP}{&OPTION_COMPRESS} = 'n'; @@ -760,11 +760,11 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_COMPRESS, false); } - if (BackRestTestCommon_Run(++$iRun, OP_RESTORE . ' option ' . OPTION_RESTORE_RECOVERY_SETTING)) + if (BackRestTestCommon_Run(++$iRun, CMD_RESTORE . ' option ' . OPTION_RESTORE_RECOVERY_SETTING)) { $oConfig = {}; $$oConfig{&CONFIG_GLOBAL . ':' . &CONFIG_SECTION_RESTORE_RECOVERY_SETTING}{'archive-command'} = '/path/to/pg_backrest'; @@ -773,11 +773,11 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_RESTORE); + configLoadExpect($oOption, CMD_RESTORE); optionTestExpect(OPTION_RESTORE_RECOVERY_SETTING, '/path/to/pg_backrest', 'archive-command'); } - if (BackRestTestCommon_Run(++$iRun, OP_RESTORE . ' option ' . OPTION_RESTORE_RECOVERY_SETTING)) + if (BackRestTestCommon_Run(++$iRun, CMD_RESTORE . ' option ' . OPTION_RESTORE_RECOVERY_SETTING)) { $oConfig = {}; $$oConfig{$strStanza . ':' . &CONFIG_SECTION_RESTORE_RECOVERY_SETTING}{'standby-mode'} = 'on'; @@ -786,10 +786,10 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_ARCHIVE_GET); + configLoadExpect($oOption, CMD_ARCHIVE_GET); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' option ' . OPTION_DB_PATH)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' option ' . OPTION_DB_PATH)) { $oConfig = {}; $$oConfig{$strStanza}{&OPTION_DB_PATH} = '/path/to/db'; @@ -798,11 +798,11 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_DB_PATH, '/path/to/db'); } - if (BackRestTestCommon_Run(++$iRun, OP_ARCHIVE_PUSH . ' option ' . OPTION_DB_PATH)) + if (BackRestTestCommon_Run(++$iRun, CMD_ARCHIVE_PUSH . ' option ' . OPTION_DB_PATH)) { $oConfig = {}; $$oConfig{$strStanza}{&OPTION_DB_PATH} = '/path/to/db'; @@ -811,11 +811,11 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_STANZA, $strStanza); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_ARCHIVE_PUSH); + configLoadExpect($oOption, CMD_ARCHIVE_PUSH); optionTestExpect(OPTION_DB_PATH, '/path/to/db'); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' option ' . OPTION_REPO_PATH)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' option ' . OPTION_REPO_PATH)) { $oConfig = {}; $$oConfig{&CONFIG_GLOBAL . ':' . &CONFIG_SECTION_GENERAL}{&OPTION_REPO_PATH} = '/repo'; @@ -825,11 +825,11 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_REPO_PATH, '/repo'); } - if (BackRestTestCommon_Run(++$iRun, OP_BACKUP . ' valid value ' . OPTION_COMMAND_PSQL)) + if (BackRestTestCommon_Run(++$iRun, CMD_BACKUP . ' valid value ' . OPTION_COMMAND_PSQL)) { $oConfig = {}; $$oConfig{&CONFIG_GLOBAL . ':' . &CONFIG_SECTION_COMMAND}{&OPTION_COMMAND_PSQL} = '/psql -X %option%'; @@ -840,7 +840,7 @@ sub BackRestTestConfig_Test optionSetTest($oOption, OPTION_DB_PATH, '/db'); optionSetTest($oOption, OPTION_CONFIG, $strConfigFile); - configLoadExpect($oOption, OP_BACKUP); + configLoadExpect($oOption, CMD_BACKUP); optionTestExpect(OPTION_COMMAND_PSQL, '/psql -X --port=5432'); }