Merge pull request #13791 from vespa-engine/vekterli/add-feature-flag-for-content-node-btree-db

Add feature flag for content node B-tree bucket DB (and remove distributor B-tree flag)

1 files changed, 8 insertions, 8 deletions

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 5b3c42df869..1f0ec0ea910 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
@@ -949,20 +949,20 @@ public class ContentClusterTest extends ContentBaseTest {
         verifyTopKProbabilityPropertiesControl();
     }
 
-    private boolean resolveDistributorBtreeDbConfigWithFeatureFlag(boolean flagEnabledBtreeDb) {
-        VespaModel model = createEnd2EndOneNode(new TestProperties().setUseDistributorBtreeDB(flagEnabledBtreeDb));
+    private boolean resolveContentNodeBtreeDbConfigWithFeatureFlag(boolean flagEnabledBtreeDb) {
+        VespaModel model = createEnd2EndOneNode(new TestProperties().setUseContentNodeBtreeDB(flagEnabledBtreeDb));
 
         ContentCluster cc = model.getContentClusters().get("storage");
-        var builder = new StorDistributormanagerConfig.Builder();
-        cc.getDistributorNodes().getConfig(builder);
+        var builder = new StorServerConfig.Builder();
+        cc.getStorageNodes().getConfig(builder);
 
-        return (new StorDistributormanagerConfig(builder)).use_btree_database();
+        return (new StorServerConfig(builder)).use_content_node_btree_bucket_db();
     }
 
     @Test
-    public void default_distributor_btree_usage_controlled_by_properties() {
-        assertFalse(resolveDistributorBtreeDbConfigWithFeatureFlag(false));
-        assertTrue(resolveDistributorBtreeDbConfigWithFeatureFlag(true));
+    public void default_content_node_btree_usage_controlled_by_properties() {
+        assertFalse(resolveContentNodeBtreeDbConfigWithFeatureFlag(false));
+        assertTrue(resolveContentNodeBtreeDbConfigWithFeatureFlag(true));
     }
 
     private boolean resolveThreePhaseUpdateConfigWithFeatureFlag(boolean flagEnableThreePhase) {