From 7ac6a7c5a793e11bce08a2bac040a1860b6edce1 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 1 Jul 2022 13:26:48 +0200 Subject: GC removed config --- .../java/com/yahoo/config/model/deploy/TestProperties.java | 12 ++++-------- .../main/java/com/yahoo/vespa/model/content/ContentNode.java | 9 --------- .../java/com/yahoo/vespa/model/content/DistributorTest.java | 3 --- .../com/yahoo/vespa/model/content/StorageClusterTest.java | 7 ------- 4 files changed, 4 insertions(+), 27 deletions(-) (limited to 'config-model') 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() { 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 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 635f799411b..0114e40a3f8 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 @@ -294,9 +294,6 @@ public class DistributorTest { assertTrue(config.mbus().dispatch_on_decode()); assertEquals(4, config.mbus().num_threads()); assertEquals(StorCommunicationmanagerConfig.Mbus.Optimize_for.LATENCY, config.mbus().optimize_for()); - assertFalse(config.skip_thread()); - assertFalse(config.mbus().skip_request_thread()); - assertFalse(config.mbus().skip_reply_thread()); } private StorDistributormanagerConfig clusterXmlToConfig(String xml) { 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 c03ffba1c34..6d2b790a07c 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 @@ -105,9 +105,6 @@ public class StorageClusterTest { assertTrue(config.mbus().dispatch_on_decode()); assertEquals(4, config.mbus().num_threads()); assertEquals(StorCommunicationmanagerConfig.Mbus.Optimize_for.LATENCY, config.mbus().optimize_for()); - assertFalse(config.skip_thread()); - assertFalse(config.mbus().skip_request_thread()); - assertFalse(config.mbus().skip_reply_thread()); } @Test @@ -148,10 +145,6 @@ public class StorageClusterTest { return new StorFilestorConfig(builder); } - private StorFilestorConfig filestorConfigFromProperties(TestProperties properties) { - return filestorConfigFromProducer(parse(cluster("foo", ""), properties)); - } - @Test public void testMergeFeatureFlags() { var config = configFromProperties(new TestProperties().setMaxMergeQueueSize(1919).setMaxConcurrentMergesPerNode(37)); -- cgit v1.2.3