diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-07-07 10:51:40 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-07-07 10:51:40 +0200 |
commit | d458686d8ab70ce2bcd6e36fb39dab143da6b5e4 (patch) | |
tree | 37a1d1a98c59a84685966a94b6d56ffd2daf67e8 | |
parent | cca2c9699dcaa56a2e75cc1b94b87a780fd4ca4a (diff) |
GC temporary dispatch flags.
5 files changed, 2 insertions, 36 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 c01bf3c234b..6f083eaf95a 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 @@ -80,8 +80,8 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"baldersheim"}, removeAfter="7.last") default boolean skipCommunicationManagerThread() { return true; } @ModelFeatureFlag(owners = {"baldersheim"}, removeAfter="7.last") default boolean skipMbusRequestThread() { return true; } @ModelFeatureFlag(owners = {"baldersheim"}, removeAfter="7.last") default boolean skipMbusReplyThread() { return true; } - @ModelFeatureFlag(owners = {"baldersheim"}) default boolean mbusDispatchOnDecode() { return true; } - @ModelFeatureFlag(owners = {"baldersheim"}) default boolean mbusDispatchOnEncode() { return true; } + @ModelFeatureFlag(owners = {"baldersheim"}, removeAfter="8.15") default boolean mbusDispatchOnDecode() { return true; } + @ModelFeatureFlag(owners = {"baldersheim"}, removeAfter="8.15") default boolean mbusDispatchOnEncode() { return true; } @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusNetworkThreads() { return 1; } @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusThreads() { return 4; } @ModelFeatureFlag(owners = {"baldersheim"}) default int mbusJavaRpcNumTargets() { return 1; } 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 5d64dfe7041..11c7f6cb6b5 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 @@ -78,8 +78,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private boolean enableBitVectors = false; private boolean loadCodeAsHugePages = false; private boolean sharedStringRepoNoReclaim = false; - private boolean mbus_dispatch_on_decode = true; - private boolean mbus_dispatch_on_encode = true; private int mbus_java_num_targets = 1; private int mbus_java_events_before_wakeup = 1; private int mbus_cpp_num_targets = 1; @@ -143,8 +141,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; } @Override public boolean sharedStringRepoNoReclaim() { return sharedStringRepoNoReclaim; } @Override public boolean loadCodeAsHugePages() { return loadCodeAsHugePages; } - @Override public boolean mbusDispatchOnDecode() { return mbus_dispatch_on_decode; } - @Override public boolean mbusDispatchOnEncode() { return mbus_dispatch_on_encode; } @Override public int mbusNetworkThreads() { return mbus_network_threads; } @Override public int mbusThreads() { return mbus_threads; } @Override public int mbusJavaRpcNumTargets() { return mbus_java_num_targets; } @@ -379,15 +375,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea return this; } - public TestProperties setMbusDispatchOnDecode(boolean value) { - this.mbus_dispatch_on_decode = value; - return this; - } - public TestProperties setMbusDispatchOnEncode(boolean value) { - this.mbus_dispatch_on_encode = value; - return this; - } - public TestProperties setMbusThreads(int value) { this.mbus_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 6ff9329ce7e..037dd578813 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,8 +21,6 @@ public abstract class ContentNode extends AbstractService private final int distributionKey; private final String rootDirectory; - private final boolean dispatch_on_encode; - private final boolean dispatch_on_decode; private final int mbus_threads; private final int mbus_network_threads; private final int mbus_rpc_targets; @@ -34,8 +32,6 @@ public abstract class ContentNode extends AbstractService super(parent, "" + distributionKey); this.distributionKey = distributionKey; this.rootDirectory = rootDirectory; - dispatch_on_decode = featureFlags.mbusDispatchOnDecode(); - dispatch_on_encode = featureFlags.mbusDispatchOnEncode(); mbus_threads = featureFlags.mbusThreads(); mbus_network_threads = featureFlags.mbusNetworkThreads(); mbus_rpc_targets = featureFlags.mbusCppRpcNumTargets(); @@ -85,8 +81,6 @@ public abstract class ContentNode extends AbstractService public void getConfig(StorCommunicationmanagerConfig.Builder builder) { builder.mbusport(getRelativePort(0)); builder.rpcport(getRelativePort(1)); - builder.mbus.dispatch_on_decode(dispatch_on_decode); - builder.mbus.dispatch_on_encode(dispatch_on_encode); builder.mbus.num_threads(mbus_threads); builder.mbus.num_network_threads(mbus_network_threads); builder.mbus.num_rpc_targets(mbus_rpc_targets); 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 b74fc763462..fd7287d465f 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 @@ -154,8 +154,6 @@ public class StorageClusterTest { @Test public void verifyDefaultMbusConfig() { var confg = communicationmanagerConfigFromProperties(new TestProperties()); - assertTrue(confg.mbus().dispatch_on_decode()); - assertTrue(confg.mbus().dispatch_on_encode()); assertEquals(4, confg.mbus().num_threads()); assertEquals(1, confg.mbus().num_network_threads()); assertEquals(1, confg.mbus().num_rpc_targets()); @@ -167,16 +165,12 @@ public class StorageClusterTest { @Test public void verifyDefaultMbusConfigControl() { var confg = communicationmanagerConfigFromProperties(new TestProperties() - .setMbusDispatchOnDecode(false) - .setMbusDispatchOnEncode(false) .setMbusThreads(3) .setMbusNetworkThreads(7) .setRpcNumTargets(11) .setRpcEventsBeforeWakeup(12) .setMbusCppRpcNumTargets(8) .setMbusCppEventsBeforeWakeup(9)); - assertFalse(confg.mbus().dispatch_on_decode()); - assertFalse(confg.mbus().dispatch_on_encode()); assertEquals(3, confg.mbus().num_threads()); assertEquals(7, confg.mbus().num_network_threads()); assertEquals(8, confg.mbus().num_rpc_targets()); diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def index 75a3344b618..ba0368964c1 100644 --- a/storage/src/vespa/storage/config/stor-communicationmanager.def +++ b/storage/src/vespa/storage/config/stor-communicationmanager.def @@ -45,15 +45,6 @@ mbus.num_threads int default=4 restart ## The number of events in the queue of a network (FNET) thread before it is woken up. mbus.events_before_wakeup int default=1 restart -## Enable to use above thread pool for encoding replies -## False will use network(fnet) thread -mbus.dispatch_on_encode bool default=true restart - -## Enable to use above thread pool for decoding replies -## False will use network(fnet) thread -## Todo: Change default once verified in large scale deployment. -mbus.dispatch_on_decode bool default=true restart - ## The number of network (FNET) threads used by the shared rpc resource. rpc.num_network_threads int default=2 restart |