mirror of
https://github.com/pgbackrest/pgbackrest.git
synced 2024-12-04 09:43:08 +02:00
Fix invalid default inherited in job-retry-interval.
This default was being mistakenly inherited from job-retry and would set job-retry-interval to 1 second for archive get and push. In practice this did not matter since archive get and push default to one retry and the first retry interval is always 0, but it still makes sense to fix it to correct the behavior when the value of job-retry is changed.
This commit is contained in:
parent
8b82641d87
commit
df469471e3
@ -843,6 +843,12 @@ option:
|
||||
type: time
|
||||
default: 15
|
||||
allow-range: [0, 900]
|
||||
command:
|
||||
archive-get: {}
|
||||
archive-push: {}
|
||||
backup: {}
|
||||
restore: {}
|
||||
verify: {}
|
||||
|
||||
lock-path:
|
||||
section: global
|
||||
|
@ -260,7 +260,6 @@ static const int64_t parseRuleValueInt[] =
|
||||
443, // val/int
|
||||
900, // val/int
|
||||
999, // val/int
|
||||
1000, // val/int
|
||||
1024, // val/int
|
||||
3600, // val/int
|
||||
5432, // val/int
|
||||
@ -310,7 +309,6 @@ typedef enum
|
||||
parseRuleValInt443, // val/int/enum
|
||||
parseRuleValInt900, // val/int/enum
|
||||
parseRuleValInt999, // val/int/enum
|
||||
parseRuleValInt1000, // val/int/enum
|
||||
parseRuleValInt1024, // val/int/enum
|
||||
parseRuleValInt3600, // val/int/enum
|
||||
parseRuleValInt5432, // val/int/enum
|
||||
@ -2400,27 +2398,6 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
||||
PARSE_RULE_OPTIONAL // opt/job-retry-interval
|
||||
( // opt/job-retry-interval
|
||||
PARSE_RULE_OPTIONAL_GROUP // opt/job-retry-interval
|
||||
( // opt/job-retry-interval
|
||||
PARSE_RULE_FILTER_CMD // opt/job-retry-interval
|
||||
( // opt/job-retry-interval
|
||||
PARSE_RULE_VAL_CMD(ArchiveGet), // opt/job-retry-interval
|
||||
PARSE_RULE_VAL_CMD(ArchivePush), // opt/job-retry-interval
|
||||
), // opt/job-retry-interval
|
||||
// opt/job-retry-interval
|
||||
PARSE_RULE_OPTIONAL_ALLOW_RANGE // opt/job-retry-interval
|
||||
( // opt/job-retry-interval
|
||||
PARSE_RULE_VAL_INT(0), // opt/job-retry-interval
|
||||
PARSE_RULE_VAL_INT(900000), // opt/job-retry-interval
|
||||
), // opt/job-retry-interval
|
||||
// opt/job-retry-interval
|
||||
PARSE_RULE_OPTIONAL_DEFAULT // opt/job-retry-interval
|
||||
( // opt/job-retry-interval
|
||||
PARSE_RULE_VAL_INT(1000), // opt/job-retry-interval
|
||||
PARSE_RULE_VAL_STR(QT_1_QT), // opt/job-retry-interval
|
||||
), // opt/job-retry-interval
|
||||
), // opt/job-retry-interval
|
||||
// opt/job-retry-interval
|
||||
PARSE_RULE_OPTIONAL_GROUP // opt/job-retry-interval
|
||||
( // opt/job-retry-interval
|
||||
PARSE_RULE_OPTIONAL_ALLOW_RANGE // opt/job-retry-interval
|
||||
( // opt/job-retry-interval
|
||||
|
Loading…
Reference in New Issue
Block a user