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

bucketdb-stripe-bits flag is no longer needed.

7 files changed, 2 insertions, 28 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index e75038a863e..828959aa7d7 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -77,7 +77,7 @@ public interface ModelContext {
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean skipMbusReplyThread() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"tokle"}) default boolean useAccessControlTlsHandshakeClientAuth() { return false; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useAsyncMessageHandlingOnSchedule() { throw new UnsupportedOperationException("TODO specify default value"); }
-        @ModelFeatureFlag(owners = {"baldersheim"}) default int contentNodeBucketDBStripeBits() { throw new UnsupportedOperationException("TODO specify default value"); }
+        @ModelFeatureFlag(owners = {"baldersheim"}, removeAfter = "7.348") default int contentNodeBucketDBStripeBits() { return 4; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default int mergeChunkSize() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default double feedConcurrency() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useBucketExecutorForLidSpaceCompact() { throw new UnsupportedOperationException("TODO specify default value"); }
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("" +
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index e1642efcd44..d1be0ec2cce 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -159,7 +159,6 @@ public class ModelContextImpl implements ModelContext {
         private final boolean skipMbusReplyThread;
         private final boolean useAccessControlTlsHandshakeClientAuth;
         private final boolean useAsyncMessageHandlingOnSchedule;
-        private final int contentNodeBucketDBStripeBits;
         private final int mergeChunkSize;
         private final double feedConcurrency;
         private final boolean reconfigurableZookeeperServer;
@@ -180,7 +179,6 @@ public class ModelContextImpl implements ModelContext {
             this.skipMbusReplyThread = flagValue(source, appId, Flags.SKIP_MBUS_REPLY_THREAD);
             this.useAccessControlTlsHandshakeClientAuth = flagValue(source, appId, Flags.USE_ACCESS_CONTROL_CLIENT_AUTHENTICATION);
             this.useAsyncMessageHandlingOnSchedule = flagValue(source, appId, Flags.USE_ASYNC_MESSAGE_HANDLING_ON_SCHEDULE);
-            this.contentNodeBucketDBStripeBits = flagValue(source, appId, Flags.CONTENT_NODE_BUCKET_DB_STRIPE_BITS);
             this.mergeChunkSize = flagValue(source, appId, Flags.MERGE_CHUNK_SIZE);
             this.feedConcurrency = flagValue(source, appId, Flags.FEED_CONCURRENCY);
             this.reconfigurableZookeeperServer = flagValue(source, appId, Flags.RECONFIGURABLE_ZOOKEEPER_SERVER_FOR_CLUSTER_CONTROLLER);
@@ -201,7 +199,6 @@ public class ModelContextImpl implements ModelContext {
         @Override public boolean skipMbusReplyThread() { return skipMbusReplyThread; }
         @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 reconfigurableZookeeperServer() { return reconfigurableZookeeperServer; }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
index 3e27e0b61ea..f1ebed0b777 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
@@ -95,7 +95,6 @@ public class ModelContextImplTest {
         assertEquals(new Version(8), context.wantedNodeVespaVersion());
         assertEquals(1.0, context.properties().featureFlags().defaultTermwiseLimit(), 0.0);
         assertFalse(context.properties().featureFlags().useAsyncMessageHandlingOnSchedule());
-        assertEquals(0, context.properties().featureFlags().contentNodeBucketDBStripeBits());
         assertEquals(0x400000, context.properties().featureFlags().mergeChunkSize());
         assertEquals(0.5, context.properties().featureFlags().feedConcurrency(), 0.0);
     }
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index eb0bc4f9ede..6389d1811fc 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -244,13 +244,6 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundIntFlag CONTENT_NODE_BUCKET_DB_STRIPE_BITS = defineIntFlag(
-            "content-node-bucket-db-stripe-bits", 0,
-            List.of("baldersheim"), "2020-12-02", "2021-02-01",
-            "Number of bits used for striping the bucket DB in service layer",
-            "Takes effect at redeployment",
-            ZONE_ID, APPLICATION_ID);
-
     public static final UnboundIntFlag MERGE_CHUNK_SIZE = defineIntFlag(
             "merge-chunk-size", 0x400000,
             List.of("baldersheim"), "2020-12-02", "2021-02-01",