Merge pull request #23240 from vespa-engine/balder/no-longer-require-sequencing

Remove 'requireSequencing' as an option.

2 files changed, 0 insertions, 15 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
index 2215a0a8df9..b4c48b3204b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.content;
 
 import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
 import com.yahoo.vespa.config.content.core.StorDistributormanagerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
@@ -71,13 +70,6 @@ public class Distributor extends ContentNode implements StorDistributormanagerCo
     }
 
     @Override
-    public void getConfig(StorCommunicationmanagerConfig.Builder builder) {
-        super.getConfig(builder);
-        // Single distributor needs help to encode the messages.
-        builder.mbus.dispatch_on_encode(true);
-    }
-
-    @Override
     public void getConfig(StorDistributormanagerConfig.Builder builder) {
         builder.num_distributor_stripes(tuneNumDistributorStripes());
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
index 1bdd281d38e..af103d4d5b9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
@@ -6,7 +6,6 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
-import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
@@ -94,10 +93,4 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
         cluster.getConfig(builder);
     }
 
-    @Override
-    public void getConfig(StorCommunicationmanagerConfig.Builder builder) {
-        super.getConfig(builder);
-        builder.mbus.dispatch_on_encode(false);
-    }
-
 }