diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-07-01 13:26:48 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-07-01 13:26:48 +0200 |
commit | 7ac6a7c5a793e11bce08a2bac040a1860b6edce1 (patch) | |
tree | efc5fab6a0aa6aadf1a0afd53e0162a0e980264c /config-model/src/main/java/com | |
parent | e4265f852d20675d873489973b3745580d2b3c5b (diff) |
GC removed config
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java | 9 |
2 files changed, 4 insertions, 17 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 3da85a83119..b59395bafaa 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 @@ -101,9 +101,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); } @Override public String responseSequencerType() { return responseSequencerType; } @Override public int defaultNumResponseThreads() { return responseNumThreads; } - @Override public boolean skipCommunicationManagerThread() { return false; } - @Override public boolean skipMbusRequestThread() { return false; } - @Override public boolean skipMbusReplyThread() { return false; } @Override public Quota quota() { return quota; } @Override public boolean useAsyncMessageHandlingOnSchedule() { return useAsyncMessageHandlingOnSchedule; } @Override public double feedConcurrency() { return feedConcurrency; } @@ -386,12 +383,11 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea @Override public boolean equals(Object o) { - if (o instanceof ConfigServerSpec) { - ConfigServerSpec other = (ConfigServerSpec)o; + if (o instanceof ConfigServerSpec rhsSpec) { - return hostName.equals(other.getHostName()) && - configServerPort == other.getConfigServerPort() && - zooKeeperPort == other.getZooKeeperPort(); + return hostName.equals(rhsSpec.getHostName()) && + configServerPort == rhsSpec.getConfigServerPort() && + zooKeeperPort == rhsSpec.getZooKeeperPort(); } else { return false; } 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 d6ed6f4f7dd..c12a245f08d 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,16 +21,10 @@ public abstract class ContentNode extends AbstractService private final int distributionKey; private final String rootDirectory; - private final boolean skipCommunicationManagerThread; - private final boolean skipMbusRequestThread; - private final boolean skipMbusReplyThread; public ContentNode(ModelContext.FeatureFlags featureFlags, AbstractConfigProducer<?> parent, String clusterName, String rootDirectory, int distributionKey) { super(parent, "" + distributionKey); this.distributionKey = distributionKey; - this.skipCommunicationManagerThread = featureFlags.skipCommunicationManagerThread(); - this.skipMbusRequestThread = featureFlags.skipMbusRequestThread(); - this.skipMbusReplyThread = featureFlags.skipMbusReplyThread(); this.rootDirectory = rootDirectory; initialize(); @@ -75,9 +69,6 @@ public abstract class ContentNode extends AbstractService public void getConfig(StorCommunicationmanagerConfig.Builder builder) { builder.mbusport(getRelativePort(0)); builder.rpcport(getRelativePort(1)); - builder.skip_thread(skipCommunicationManagerThread); - builder.mbus.skip_request_thread(skipMbusRequestThread); - builder.mbus.skip_reply_thread(skipMbusReplyThread); } @Override |