Merge pull request #13109 from vespa-engine/vekterli/add-feature-flag-for-distributor-btree-db

Add feature flag for enabling distributor B-tree bucket DB

3 files changed, 31 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index d799af36c3b..475b69c93c2 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -41,6 +41,7 @@ public class TestProperties implements ModelContext.Properties {
     private boolean useDedicatedNodeForLogserver = false;
     private boolean useAdaptiveDispatch = false;
     private double topKProbability = 1.0;
+    private boolean useDistributorBtreeDb = false;
     private double defaultTermwiseLimit = 1.0;
     private double softStartSeconds = 0.0;
     private double threadPoolSizeFactor = 0.0;
@@ -82,6 +83,7 @@ public class TestProperties implements ModelContext.Properties {
     }
 
     @Override public double defaultTopKProbability() { return topKProbability; }
+    @Override public boolean useDistributorBtreeDb() { return useDistributorBtreeDb; }
     @Override public boolean useBucketSpaceMetric() { return true; }
     @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); }
 
@@ -94,6 +96,12 @@ public class TestProperties implements ModelContext.Properties {
         topKProbability = probability;
         return this;
     }
+
+    public TestProperties setUseDistributorBtreeDB(boolean useBtreeDb) {
+        useDistributorBtreeDb = useBtreeDb;
+        return this;
+    }
+
     public TestProperties setSoftStartSeconds(double softStartSeconds) {
         this.softStartSeconds = softStartSeconds;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
index 045646cbc5c..42d20b675a6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
@@ -41,6 +41,7 @@ public class DistributorCluster extends AbstractConfigProducer<Distributor> impl
     private final BucketSplitting bucketSplitting;
     private final GcOptions gc;
     private final boolean hasIndexedDocumentType;
+    private final boolean useBtreeDatabase;
 
     public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<DistributorCluster> {
 
@@ -101,20 +102,24 @@ public class DistributorCluster extends AbstractConfigProducer<Distributor> impl
             final ModelElement documentsNode = clusterElement.child("documents");
             final GcOptions gc = parseGcOptions(documentsNode);
             final boolean hasIndexedDocumentType = clusterContainsIndexedDocumentType(documentsNode);
+            boolean useBtreeDb = deployState.getProperties().useDistributorBtreeDb();
 
             return new DistributorCluster(parent,
-                    new BucketSplitting.Builder().build(new ModelElement(producerSpec)), gc, hasIndexedDocumentType);
+                    new BucketSplitting.Builder().build(new ModelElement(producerSpec)), gc,
+                    hasIndexedDocumentType, useBtreeDb);
         }
     }
 
     private DistributorCluster(ContentCluster parent, BucketSplitting bucketSplitting,
-                               GcOptions gc, boolean hasIndexedDocumentType)
+                               GcOptions gc, boolean hasIndexedDocumentType,
+                               boolean useBtreeDatabase)
     {
         super(parent, "distributor");
         this.parent = parent;
         this.bucketSplitting = bucketSplitting;
         this.gc = gc;
         this.hasIndexedDocumentType = hasIndexedDocumentType;
+        this.useBtreeDatabase = useBtreeDatabase;
     }
 
     @Override
@@ -126,6 +131,7 @@ public class DistributorCluster extends AbstractConfigProducer<Distributor> impl
         }
         builder.enable_revert(parent.getPersistence().supportRevert());
         builder.disable_bucket_activation(hasIndexedDocumentType == false);
+        builder.use_btree_database(useBtreeDatabase);
 
         bucketSplitting.getConfig(builder);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 4d5df7c1965..0e8bd0a41f1 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -972,5 +972,20 @@ public class ContentClusterTest extends ContentBaseTest {
         verifyTopKProbabilityPropertiesControl(0.77);
     }
 
+    private boolean resolveDistributorBtreeDbConfigWithFeatureFlag(boolean flagEnabledBtreeDb) {
+        VespaModel model = createEnd2EndOneNode(new TestProperties().setUseDistributorBtreeDB(flagEnabledBtreeDb));
+
+        ContentCluster cc = model.getContentClusters().get("storage");
+        var builder = new StorDistributormanagerConfig.Builder();
+        cc.getDistributorNodes().getConfig(builder);
+
+        return (new StorDistributormanagerConfig(builder)).use_btree_database();
+    }
+
+    @Test
+    public void default_distributor_btree_usage_controlled_by_properties() {
+        assertFalse(resolveDistributorBtreeDbConfigWithFeatureFlag(false));
+        assertTrue(resolveDistributorBtreeDbConfigWithFeatureFlag(true));
+    }
 
 }