diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-07-03 17:23:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-03 17:23:47 +0200 |
commit | 9b7a9a8b1dbc828e632cf9f812db271c4a132320 (patch) | |
tree | b077d3d6a8623d1aef8bb6a8632a484a8f387aa1 /config-model/src/main/java | |
parent | df3d9cfed3dea0011fecdd6a7c7f5161a0e91f0e (diff) | |
parent | 275dfef0f2c9b9f2acfbefeb759c34d76c973e43 (diff) |
Merge pull request #13799 from vespa-engine/balder/only-use-encode-help-on-distributor
Only the distributor need help encoding. Proton has enough workers.
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java | 7 |
2 files changed, 15 insertions, 0 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 c55548cfd2b..4b07b78a713 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 @@ -2,6 +2,7 @@ package com.yahoo.vespa.model.content; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig; import com.yahoo.vespa.config.content.core.StorServerConfig; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.builder.xml.dom.ModelElement; @@ -50,6 +51,13 @@ public class Distributor extends ContentNode { } @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 String getStartupCommand() { return "exec sbin/vespa-distributord -c $VESPA_CONFIG_ID"; } 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 f41188eccde..d40abec5bb1 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 @@ -5,6 +5,7 @@ import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.provision.Flavor; 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.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.defaults.Defaults; @@ -92,4 +93,10 @@ 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); + } + } |