db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Remove deprecated archive-max-mb option.

Browse Source
This commit is contained in:
David Steele 2017-11-27 20:43:44 -05:00
parent c5ea53bcf9
commit 2ed426a70b
11 changed files with 15 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/lib/pgBackRestBuild/Config/Data.pm
View File

@ -222,9 +222,6 @@ use constant CFGOPT_LOG_TIMESTAMP => 'log-time
#-----------------------------------------------------------------------------------------------------------------------------------
use constant CFGOPT_ARCHIVE_ASYNC => 'archive-async';
push @EXPORT, qw(CFGOPT_ARCHIVE_ASYNC);
# Deprecated and to be removed
use constant CFGOPT_ARCHIVE_MAX_MB => 'archive-max-mb';
push @EXPORT, qw(CFGOPT_ARCHIVE_MAX_MB);
use constant CFGOPT_ARCHIVE_QUEUE_MAX => 'archive-queue-max';
push @EXPORT, qw(CFGOPT_ARCHIVE_QUEUE_MAX);
@ -1313,18 +1310,6 @@ my %hConfigDefine =
}
},
# Deprecated and to be removed
&CFGOPT_ARCHIVE_MAX_MB =>
{
&CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL,
&CFGDEF_TYPE => CFGDEF_TYPE_INTEGER,
&CFGDEF_REQUIRED => false,
&CFGDEF_COMMAND =>
{
&CFGCMD_ARCHIVE_PUSH => {},
}
},
&CFGOPT_ARCHIVE_QUEUE_MAX =>
{
&CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL,

6
doc/lib/BackRestDoc/Common/DocConfig.pm
View File

@ -209,10 +209,8 @@ sub process
foreach my $strOption (sort(keys(%{$oOptionDefine})))
{
if ($strOption =~ /^test/ || $strOption eq CFGOPT_ARCHIVE_MAX_MB)
{
next;
}
# Test options are not documented
next if ($strOption =~ /^test/);
# Iterate through all commands
my @stryCommandList = sort(keys(%{defined($$oOptionDefine{$strOption}{&CFGDEF_COMMAND}) ?

4
doc/xml/release.xml
View File

@ -34,6 +34,10 @@
<release-item>
<p>Add <code>List</code> and <code>StringList</code> objects to simplify list handling.</p>
</release-item>
<release-item>
<p>Remove deprecated <br-option>archive-max-mb</br-option> option.</p>
</release-item>
</release-development-list>
</release-core-list>

8
lib/pgBackRest/Config/Config.pm
View File

@ -295,14 +295,6 @@ sub configLoad
}
}
# Warn if ARCHIVE_MAX_MB is present
if (cfgOptionValid(CFGOPT_ARCHIVE_MAX_MB) && cfgOptionTest(CFGOPT_ARCHIVE_MAX_MB))
{
&log(WARN,
"'" . cfgOptionName(CFGOPT_ARCHIVE_MAX_MB) . "' is no longer not longer valid, use '" .
cfgOptionName(CFGOPT_ARCHIVE_QUEUE_MAX) . "' instead");
}
return true;
}

1
libc/lib/pgBackRest/LibCAuto.pm
View File

@ -117,7 +117,6 @@ sub libcAutoExportTag
'CFGOPT_ARCHIVE_ASYNC',
'CFGOPT_ARCHIVE_CHECK',
'CFGOPT_ARCHIVE_COPY',
'CFGOPT_ARCHIVE_MAX_MB',
'CFGOPT_ARCHIVE_QUEUE_MAX',
'CFGOPT_ARCHIVE_TIMEOUT',
'CFGOPT_BACKUP_CMD',

1
libc/xs/config/config.auto.xsh
View File

@ -31,7 +31,6 @@ Option constants
#define CFGOPT_ARCHIVE_ASYNC cfgOptArchiveAsync
#define CFGOPT_ARCHIVE_CHECK cfgOptArchiveCheck
#define CFGOPT_ARCHIVE_COPY cfgOptArchiveCopy
#define CFGOPT_ARCHIVE_MAX_MB cfgOptArchiveMaxMb
#define CFGOPT_ARCHIVE_QUEUE_MAX cfgOptArchiveQueueMax
#define CFGOPT_ARCHIVE_TIMEOUT cfgOptArchiveTimeout
#define CFGOPT_BACKUP_CMD cfgOptBackupCmd

8
src/config/config.auto.c
View File

@ -114,14 +114,6 @@ ConfigOptionData configOptionData[] = CONFIG_OPTION_LIST
CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveCopy)
)
//------------------------------------------------------------------------------------------------------------------------------
CONFIG_OPTION
(
CONFIG_OPTION_NAME("archive-max-mb")
CONFIG_OPTION_INDEX(0)
CONFIG_OPTION_DEFINE_ID(cfgDefOptArchiveMaxMb)
)
//------------------------------------------------------------------------------------------------------------------------------
CONFIG_OPTION
(

17
src/config/config.auto.h
View File

@ -36,7 +36,6 @@ typedef enum
cfgOptArchiveAsync,
cfgOptArchiveCheck,
cfgOptArchiveCopy,
cfgOptArchiveMaxMb,
cfgOptArchiveQueueMax,
cfgOptArchiveTimeout,
cfgOptBackupCmd,
@ -54,16 +53,16 @@ typedef enum
cfgOptCompressLevelNetwork,
cfgOptConfig,
cfgOptDbCmd,
cfgOptDbConfig = 28,
cfgOptDbHost = 36,
cfgOptDbInclude = 44,
cfgOptDbConfig = 27,
cfgOptDbHost = 35,
cfgOptDbInclude = 43,
cfgOptDbPath,
cfgOptDbPort = 53,
cfgOptDbSocketPath = 61,
cfgOptDbSshPort = 69,
cfgOptDbTimeout = 77,
cfgOptDbPort = 52,
cfgOptDbSocketPath = 60,
cfgOptDbSshPort = 68,
cfgOptDbTimeout = 76,
cfgOptDbUser,
cfgOptDelta = 86,
cfgOptDelta = 85,
cfgOptForce,
cfgOptHardlink,
cfgOptHostId,

18
src/config/define.auto.c
View File

@ -177,24 +177,6 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST
)
)
// -----------------------------------------------------------------------------------------------------------------------------
CFGDEFDATA_OPTION
(
CFGDEFDATA_OPTION_NAME("archive-max-mb")
CFGDEFDATA_OPTION_REQUIRED(false)
CFGDEFDATA_OPTION_SECTION(cfgDefSectionGlobal)
CFGDEFDATA_OPTION_TYPE(cfgDefOptTypeInteger)
CFGDEFDATA_OPTION_INDEX_TOTAL(1)
CFGDEFDATA_OPTION_NEGATE(false)
CFGDEFDATA_OPTION_SECURE(false)
CFGDEFDATA_OPTION_COMMAND_LIST
(
CFGDEFDATA_OPTION_COMMAND(cfgDefCmdArchivePush)
)
)
// -----------------------------------------------------------------------------------------------------------------------------
CFGDEFDATA_OPTION
(

1
src/config/define.auto.h
View File

@ -49,7 +49,6 @@ typedef enum
cfgDefOptArchiveAsync,
cfgDefOptArchiveCheck,
cfgDefOptArchiveCopy,
cfgDefOptArchiveMaxMb,
cfgDefOptArchiveQueueMax,
cfgDefOptArchiveTimeout,
cfgDefOptBackupCmd,

2
test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm
View File

@ -87,7 +87,7 @@ sub run
{&INFO_ARCHIVE_SECTION_DB => {&INFO_ARCHIVE_KEY_DB_VERSION => '8.0'}});
}
# Push two more segments with errors to exceed archive-max-mb
# Push two more segments with errors to exceed archive-queue-max
$oHostDbMaster->archivePush(
$strWalPath, $strWalTestFile, 2, $iError ? ERROR_FILE_READ : ERROR_ARCHIVE_MISMATCH);