Merge pull request #11394 from vespa-engine/hmusum/remove-unused-config

Remove code for generating unused score-board config

2 files changed, 0 insertions, 18 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 233db8ecf7e..f3758def2b1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.StatisticsConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
-import com.yahoo.jdisc.metrics.yamasconsumer.cloud.ScoreBoardConfig;
 import com.yahoo.net.HostName;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.container.ContainerCluster;
@@ -29,7 +28,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         implements
         ZookeeperServerConfig.Producer,
         ConfigserverConfig.Producer,
-        ScoreBoardConfig.Producer,
         StatisticsConfig.Producer,
         HealthMonitorConfig.Producer {
     private final CloudConfigOptions options;
@@ -170,13 +168,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
     }
 
     @Override
-    public void getConfig(ScoreBoardConfig.Builder builder) {
-        builder.applicationName("configserver");
-        builder.flushTime(60);
-        builder.step(60);
-    }
-
-    @Override
     public void getConfig(StatisticsConfig.Builder builder) {
         builder.collectionintervalsec(60.0);
         builder.loggingintervalsec(60.0);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
index 94f8d34e7c6..33dc3f59a80 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
@@ -9,7 +9,6 @@ import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.container.StatisticsConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
-import com.yahoo.jdisc.metrics.yamasconsumer.cloud.ScoreBoardConfig;
 import com.yahoo.net.HostName;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.defaults.Defaults;
@@ -91,14 +90,6 @@ public class ConfigserverClusterTest {
     }
 
     @Test
-    public void testScoreBoardConfig() {
-        ScoreBoardConfig config = getConfig(ScoreBoardConfig.class);
-        assertThat(config.applicationName(), is("configserver"));
-        assertThat(config.flushTime(), is(60));
-        assertThat(config.step(), is(60));
-    }
-
-    @Test
     public void testHealthMonitorConfig() {
         HealthMonitorConfig config = getConfig(HealthMonitorConfig.class);
         assertThat(((int) config.snapshot_interval()), is(60));