GC mbus numThreads.

4 files changed, 0 insertions, 20 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 11c7f6cb6b5..400aea86834 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
@@ -84,7 +84,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private int mbus_cpp_events_before_wakeup = 1;
     private int rpc_num_targets = 1;
     private int rpc_events_before_wakeup = 1;
-    private int mbus_threads = 4;
     private int mbus_network_threads = 1;
     private Architecture adminClusterNodeResourcesArchitecture = Architecture.getDefault();
 
@@ -142,7 +141,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public boolean sharedStringRepoNoReclaim() { return sharedStringRepoNoReclaim; }
     @Override public boolean loadCodeAsHugePages() { return loadCodeAsHugePages; }
     @Override public int mbusNetworkThreads() { return mbus_network_threads; }
-    @Override public int mbusThreads() { return mbus_threads; }
     @Override public int mbusJavaRpcNumTargets() { return mbus_java_num_targets; }
     @Override public int mbusJavaEventsBeforeWakeup() { return mbus_java_events_before_wakeup; }
     @Override public int mbusCppRpcNumTargets() { return mbus_cpp_num_targets; }
@@ -375,11 +373,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setMbusThreads(int value) {
-        this.mbus_threads = value;
-        return this;
-    }
-
     public TestProperties setMbusNetworkThreads(int value) {
         this.mbus_network_threads = value;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
index 037dd578813..c52bb6fa2de 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
@@ -21,7 +21,6 @@ public abstract class ContentNode extends AbstractService
 
     private final int distributionKey;
     private final String rootDirectory;
-    private final int mbus_threads;
     private final int mbus_network_threads;
     private final int mbus_rpc_targets;
     private final int mbus_events_before_wakeup;
@@ -32,7 +31,6 @@ public abstract class ContentNode extends AbstractService
         super(parent, "" + distributionKey);
         this.distributionKey = distributionKey;
         this.rootDirectory = rootDirectory;
-        mbus_threads = featureFlags.mbusThreads();
         mbus_network_threads = featureFlags.mbusNetworkThreads();
         mbus_rpc_targets = featureFlags.mbusCppRpcNumTargets();
         mbus_events_before_wakeup = featureFlags.mbusCppEventsBeforeWakeup();
@@ -81,7 +79,6 @@ public abstract class ContentNode extends AbstractService
     public void getConfig(StorCommunicationmanagerConfig.Builder builder) {
         builder.mbusport(getRelativePort(0));
         builder.rpcport(getRelativePort(1));
-        builder.mbus.num_threads(mbus_threads);
         builder.mbus.num_network_threads(mbus_network_threads);
         builder.mbus.num_rpc_targets(mbus_rpc_targets);
         builder.mbus.events_before_wakeup(mbus_events_before_wakeup);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java
index 2031e74bd5b..015356d6088 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java
@@ -273,7 +273,6 @@ public class DistributorTest {
 
         cluster.getChildren().get("0").getConfig(builder);
         StorCommunicationmanagerConfig config = new StorCommunicationmanagerConfig(builder);
-        assertTrue(config.mbus().dispatch_on_encode());
         assertEquals(14066, config.rpcport());
     }
 
@@ -290,9 +289,6 @@ public class DistributorTest {
 
         cluster.getChildren().get("0").getConfig(builder);
         StorCommunicationmanagerConfig config = new StorCommunicationmanagerConfig(builder);
-        assertTrue(config.mbus().dispatch_on_encode());
-        assertTrue(config.mbus().dispatch_on_decode());
-        assertEquals(4, config.mbus().num_threads());
         assertEquals(1, config.mbus().num_network_threads());
     }
 
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 fd7287d465f..c494ba0394a 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
@@ -101,9 +101,6 @@ public class StorageClusterTest {
         StorCommunicationmanagerConfig.Builder builder = new StorCommunicationmanagerConfig.Builder();
         storage.getChildren().get("0").getConfig(builder);
         StorCommunicationmanagerConfig config = new StorCommunicationmanagerConfig(builder);
-        assertTrue(config.mbus().dispatch_on_encode());
-        assertTrue(config.mbus().dispatch_on_decode());
-        assertEquals(4, config.mbus().num_threads());
         assertEquals(1, config.mbus().num_network_threads());
     }
 
@@ -154,7 +151,6 @@ public class StorageClusterTest {
     @Test
     public void verifyDefaultMbusConfig() {
         var confg = communicationmanagerConfigFromProperties(new TestProperties());
-        assertEquals(4, confg.mbus().num_threads());
         assertEquals(1, confg.mbus().num_network_threads());
         assertEquals(1, confg.mbus().num_rpc_targets());
         assertEquals(1, confg.mbus().events_before_wakeup());
@@ -165,13 +161,11 @@ public class StorageClusterTest {
     @Test
     public void verifyDefaultMbusConfigControl() {
         var confg = communicationmanagerConfigFromProperties(new TestProperties()
-                .setMbusThreads(3)
                 .setMbusNetworkThreads(7)
                 .setRpcNumTargets(11)
                 .setRpcEventsBeforeWakeup(12)
                 .setMbusCppRpcNumTargets(8)
                 .setMbusCppEventsBeforeWakeup(9));
-        assertEquals(3, confg.mbus().num_threads());
         assertEquals(7, confg.mbus().num_network_threads());
         assertEquals(8, confg.mbus().num_rpc_targets());
         assertEquals(9, confg.mbus().events_before_wakeup());