summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2022-02-11 11:34:41 +0000
committerTor Brede Vekterli <vekterli@yahooinc.com>2022-02-11 11:34:41 +0000
commit93fcafb20df572dbfa02e87eeab0d5372fd9d00c (patch)
treedc918c82155a59fbe47c673d29b3219ce695d940 /storage
parentc91f726a5eef7e24b688db594620ef112e0a281e (diff)
Add config for default bucket space merge inhibition during global merges
Not wired to anything yet, but allows for feature flag to be created.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/config/stor-distributormanager.def6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def
index a01bd30546e..1d2d4babf74 100644
--- a/storage/src/vespa/storage/config/stor-distributormanager.def
+++ b/storage/src/vespa/storage/config/stor-distributormanager.def
@@ -293,3 +293,9 @@ implicitly_clear_bucket_priority_on_schedule bool default=true
## involved in a given merge have previously reported (as part of bucket info fetching)
## that they support the unordered merge feature.
use_unordered_merge_chaining bool default=true
+
+## If true, inhibits _all_ merges to buckets in the default bucket space if the current
+## cluster state bundle indicates that global merges are pending in the cluster, i.e.
+## one or more nodes is in maintenance mode in the default bucket space but marked up in
+## the global bucket space.
+inhibit_default_merges_when_global_merges_pending bool default=false