summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@verizonmedia.com>2020-06-30 09:51:15 +0000
committerTor Brede Vekterli <vekterli@verizonmedia.com>2020-06-30 09:51:15 +0000
commite8be46dc7ea0258eb7e2909306480c1fa62ab582 (patch)
tree2ae731d7fa97db01edd018fed395e4aeff136851
parent848174d1efea5d117db2accd228247e649c21803 (diff)
Flip distributor B-tree DB config flag to true by default
-rw-r--r--storage/src/vespa/storage/config/stor-distributormanager.def4
-rw-r--r--storage/src/vespa/storage/distributor/distributor.cpp4
2 files changed, 2 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def
index 71059d717a6..db2bfb61376 100644
--- a/storage/src/vespa/storage/config/stor-distributormanager.def
+++ b/storage/src/vespa/storage/config/stor-distributormanager.def
@@ -203,7 +203,7 @@ simulated_db_merging_latency_msec int default=0
## Whether to use a B-tree data structure for the distributor bucket database instead
## of the legacy database. Setting this option may trigger alternate code paths for
## read only operations, as the B-tree database is thread safe for concurrent reads.
-use_btree_database bool default=false restart
+use_btree_database bool default=true restart
## If a bucket is inconsistent and an Update operation is received, a two-phase
## write-repair path is triggered in which a Get is sent to all diverging replicas.
@@ -243,4 +243,4 @@ enable_metadata_only_fetch_phase_for_inconsistent_updates bool default=false
## maintenance scans from being done as part of the tick for up to N rounds of ticking.
## This is to reduce the amount of CPU spent on ideal state calculations and bucket DB
## accesses when the distributor is heavily loaded with feed operations.
-max_consecutively_inhibited_maintenance_ticks int default=20 \ No newline at end of file
+max_consecutively_inhibited_maintenance_ticks int default=20
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp
index 5dade47c2a6..5080b16c727 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/distributor.cpp
@@ -109,10 +109,6 @@ Distributor::Distributor(DistributorComponentRegister& compReg,
_must_send_updated_host_info(false),
_use_btree_database(use_btree_database)
{
- if (use_btree_database) {
- LOG(info, "Using new B-tree bucket database implementation instead of legacy implementation"); // TODO remove this once default is swapped
- }
-
_component.registerMetric(*_metrics);
_component.registerMetricUpdateHook(_metricUpdateHook,
framework::SecondTime(0));