diff --git a/build/lib/pgBackRestBuild/Config/Data.pm b/build/lib/pgBackRestBuild/Config/Data.pm
index 180305d10..c844aee37 100644
--- a/build/lib/pgBackRestBuild/Config/Data.pm
+++ b/build/lib/pgBackRestBuild/Config/Data.pm
@@ -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,
diff --git a/doc/lib/BackRestDoc/Common/DocConfig.pm b/doc/lib/BackRestDoc/Common/DocConfig.pm
index fb57188e7..e988756b1 100644
--- a/doc/lib/BackRestDoc/Common/DocConfig.pm
+++ b/doc/lib/BackRestDoc/Common/DocConfig.pm
@@ -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}) ?
diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index f5faddc27..24d947a54 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -34,6 +34,10 @@
Add List and StringList objects to simplify list handling.
+
+
+ Remove deprecated archive-max-mb option.
+
diff --git a/lib/pgBackRest/Config/Config.pm b/lib/pgBackRest/Config/Config.pm
index b2b924034..b3608d344 100644
--- a/lib/pgBackRest/Config/Config.pm
+++ b/lib/pgBackRest/Config/Config.pm
@@ -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;
}
diff --git a/libc/lib/pgBackRest/LibCAuto.pm b/libc/lib/pgBackRest/LibCAuto.pm
index a9762874f..639f5cedc 100644
--- a/libc/lib/pgBackRest/LibCAuto.pm
+++ b/libc/lib/pgBackRest/LibCAuto.pm
@@ -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',
diff --git a/libc/xs/config/config.auto.xsh b/libc/xs/config/config.auto.xsh
index 3da4b5cbf..6750f5fd3 100644
--- a/libc/xs/config/config.auto.xsh
+++ b/libc/xs/config/config.auto.xsh
@@ -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
diff --git a/src/config/config.auto.c b/src/config/config.auto.c
index 8dcba7728..fb23d0342 100644
--- a/src/config/config.auto.c
+++ b/src/config/config.auto.c
@@ -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
(
diff --git a/src/config/config.auto.h b/src/config/config.auto.h
index 3af843a70..42db1f8e5 100644
--- a/src/config/config.auto.h
+++ b/src/config/config.auto.h
@@ -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,
diff --git a/src/config/define.auto.c b/src/config/define.auto.c
index 47beeeda5..309a6ed7e 100644
--- a/src/config/define.auto.c
+++ b/src/config/define.auto.c
@@ -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
(
diff --git a/src/config/define.auto.h b/src/config/define.auto.h
index c08ce27d8..7cbafde28 100644
--- a/src/config/define.auto.h
+++ b/src/config/define.auto.h
@@ -49,7 +49,6 @@ typedef enum
cfgDefOptArchiveAsync,
cfgDefOptArchiveCheck,
cfgDefOptArchiveCopy,
- cfgDefOptArchiveMaxMb,
cfgDefOptArchiveQueueMax,
cfgDefOptArchiveTimeout,
cfgDefOptBackupCmd,
diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm b/test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm
index fea857937..fa61fc805 100644
--- a/test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm
+++ b/test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm
@@ -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);