diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/config/stor-distributormanager.def | 6 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/stor-server.def | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def index 5162e337f24..dba36d1b73d 100644 --- a/storage/src/vespa/storage/config/stor-distributormanager.def +++ b/storage/src/vespa/storage/config/stor-distributormanager.def @@ -189,7 +189,7 @@ sequence_mutating_operations bool default=true ## Number of seconds that scheduling of new merge operations should be inhibited ## towards a node if it has indicated that its merge queues are full or it is ## suffering from resource exhaustion. -inhibit_merge_sending_on_busy_node_duration_sec int default=10 +inhibit_merge_sending_on_busy_node_duration_sec int default=1 ## If set, enables potentially stale reads during cluster state transitions where ## buckets change ownership. This also implicitly enables support for two-phase @@ -285,11 +285,11 @@ num_distributor_stripes int default=0 restart ## bucket maintenance priority database even when no operation can be started for the ## bucket due to being blocked by concurrent operations. This avoids potential head-of-line ## blocking of later buckets in the priority database. -implicitly_clear_bucket_priority_on_schedule bool default=false +implicitly_clear_bucket_priority_on_schedule bool default=true ## Enables sending merges that are forwarded between content nodes in ideal state node key ## order, instead of strictly increasing node key order (which is the default). ## Even if this config is set to true, unordered merges will only be sent if _all_ nodes ## 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=false +use_unordered_merge_chaining bool default=true diff --git a/storage/src/vespa/storage/config/stor-server.def b/storage/src/vespa/storage/config/stor-server.def index 6611c3cba91..a368c2e5b6f 100644 --- a/storage/src/vespa/storage/config/stor-server.def +++ b/storage/src/vespa/storage/config/stor-server.def @@ -34,7 +34,7 @@ node_reliability int default=1 restart ## merge, only actually starting the operation when every node has ## allowed it to pass through. max_merges_per_node int default=16 -max_merge_queue_size int default=1024 +max_merge_queue_size int default=100 ## If the persistence provider indicates that it has exhausted one or more ## of its internal resources during a mutating operation, new merges will @@ -51,7 +51,7 @@ resource_exhaustion_merge_back_pressure_duration_secs double default=30.0 ## the current queue size. This avoids wasting the time spent being accepted ## into merge windows, which would happen if the merge were to be bounced with ## a busy-reply that would subsequently be unwound through the entire merge chain. -disable_queue_limits_for_chained_merges bool default=false +disable_queue_limits_for_chained_merges bool default=true ## Whether the deadlock detector should be enabled or not. If disabled, it will ## still run, but it will never actually abort the process it is running in. |