Merge pull request #16138 from vespa-engine/balder/gc-unused-bucketdb-feature-flag

bucketdb-stripe-bits flag is no longer needed.

3 files changed, 1 insertions, 16 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 92d425a9d4e..95104391dfd 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
@@ -47,7 +47,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private Quota quota = Quota.unlimited();
     private boolean useAccessControlTlsHandshakeClientAuth;
     private boolean useAsyncMessageHandlingOnSchedule = false;
-    private int contentNodeBucketDBStripeBits = 0;
     private int mergeChunkSize = 0x400000 - 0x1000; // 4M -4k
     private double feedConcurrency = 0.5;
     private boolean enableAutomaticReindexing = false;
@@ -82,7 +81,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public Quota quota() { return quota; }
     @Override public boolean useAccessControlTlsHandshakeClientAuth() { return useAccessControlTlsHandshakeClientAuth; }
     @Override public boolean useAsyncMessageHandlingOnSchedule() { return useAsyncMessageHandlingOnSchedule; }
-    @Override public int contentNodeBucketDBStripeBits() { return contentNodeBucketDBStripeBits; }
     @Override public int mergeChunkSize() { return mergeChunkSize; }
     @Override public double feedConcurrency() { return feedConcurrency; }
     @Override public boolean enableAutomaticReindexing() { return enableAutomaticReindexing; }
@@ -98,10 +96,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         mergeChunkSize = size;
         return this;
     }
-    public TestProperties setContentNodeBucketDBStripeBits(int bits) {
-        contentNodeBucketDBStripeBits = bits;
-        return this;
-    }
 
     public TestProperties setAsyncMessageHandlingOnSchedule(boolean value) {
         useAsyncMessageHandlingOnSchedule = value;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java
index e34ccb9696c..40a634fbfe8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java
@@ -15,7 +15,6 @@ public class StorServerProducer implements StorServerConfig.Producer {
             ModelElement tuning = element.child("tuning");
 
             StorServerProducer producer = new StorServerProducer(ContentCluster.getClusterId(element));
-            producer.setBucketDBStripeBits(properties.featureFlags().contentNodeBucketDBStripeBits());
             if (tuning == null) return producer;
 
             ModelElement merges = tuning.child("merges");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 3ccdc739410..9c857414717 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -75,7 +75,7 @@ public class StorageClusterTest {
         StorServerConfig config = new StorServerConfig(builder);
         assertFalse(config.is_distributor());
         assertEquals("foofighters", config.cluster_name());
-        assertEquals(0, config.content_node_bucket_db_stripe_bits());
+        assertEquals(4, config.content_node_bucket_db_stripe_bits());
     }
     @Test
     public void testCommunicationManagerDefaults() {
@@ -97,14 +97,6 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testBucketDBStripeBitsControl() {
-        StorServerConfig.Builder builder = new StorServerConfig.Builder();
-        simpleCluster(new TestProperties().setContentNodeBucketDBStripeBits(7)).getConfig(builder);
-        StorServerConfig config = new StorServerConfig(builder);
-        assertEquals(7, config.content_node_bucket_db_stripe_bits());
-    }
-
-    @Test
     public void testMerges() {
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
         parse("" +