From fe9fd2ff2d778b86c0df159aabe7644f18f6479f Mon Sep 17 00:00:00 2001 From: David Steele Date: Tue, 22 Mar 2022 09:02:33 -0600 Subject: [PATCH] Disable repo-hardlink option when repo-bundle option is enabled. Hardlinking will not work with bundles because files are not stored individually. --- doc/xml/release.xml | 1 + src/build/config/config.yaml | 4 ++++ src/command/backup/backup.c | 4 ++++ src/config/parse.auto.c | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 39f53c2ea..e32d3b387 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -103,6 +103,7 @@ + diff --git a/src/build/config/config.yaml b/src/build/config/config.yaml index 155260c8d..ee54b9eb9 100644 --- a/src/build/config/config.yaml +++ b/src/build/config/config.yaml @@ -1840,6 +1840,10 @@ option: backup: {} command-role: main: {} + depend: + option: repo-bundle + list: + - false deprecate: hardlink: {} diff --git a/src/command/backup/backup.c b/src/command/backup/backup.c index 8f7268077..d2c279a9c 100644 --- a/src/command/backup/backup.c +++ b/src/command/backup/backup.c @@ -190,6 +190,10 @@ backupInit(const InfoBackup *infoBackup) cfgOptionSet(cfgOptBackupStandby, cfgSourceParam, BOOL_FALSE_VAR); } + // If hardlink is not set (because bundles are enabled) then set to false + if (!cfgOptionTest(cfgOptRepoHardlink)) + cfgOptionSet(cfgOptRepoHardlink, cfgSourceDefault, BOOL_FALSE_VAR); + // Get database info when online PgControl pgControl = {0}; diff --git a/src/config/parse.auto.c b/src/config/parse.auto.c index 51b30a1db..97ff2ad8a 100644 --- a/src/config/parse.auto.c +++ b/src/config/parse.auto.c @@ -5466,6 +5466,12 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] = ( PARSE_RULE_OPTIONAL_GROUP ( + PARSE_RULE_OPTIONAL_DEPEND + ( + PARSE_RULE_VAL_OPT(cfgOptRepoBundle), + PARSE_RULE_VAL_BOOL_FALSE, + ), + PARSE_RULE_OPTIONAL_DEFAULT ( PARSE_RULE_VAL_BOOL_FALSE,