diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-04-29 07:52:36 +0200 |
---|---|---|
committer | Arne H Juul <arnej27959@users.noreply.github.com> | 2022-04-29 10:11:44 +0200 |
commit | 2d10e45e1aca4122739d62a48dfddb43207f4607 (patch) | |
tree | df9bdb82fd04b4a52118d683eabfe328b530a899 /config-model | |
parent | 5b5f725ec9dd5ec81539e4d315e1d7adf054e0d1 (diff) |
GC testing of unused statistics.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java | 30 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java | 8 |
2 files changed, 0 insertions, 38 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java index 96f6c7999cc..7bdf80706d6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java @@ -14,15 +14,12 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; -import com.yahoo.container.StatisticsConfig; import com.yahoo.container.jdisc.config.HealthMonitorConfig; import com.yahoo.net.HostName; import com.yahoo.vespa.config.core.StateserverConfig; import com.yahoo.vespa.model.Service; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.ApplicationContainerCluster; -import com.yahoo.vespa.model.container.component.Component; -import com.yahoo.vespa.model.container.component.StatisticsComponent; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; import org.junit.Test; @@ -224,33 +221,6 @@ public class AdminTestCase { qrCluster.getConfig(builder); HealthMonitorConfig qrClusterConfig = new HealthMonitorConfig(builder); assertEquals(60, (int) qrClusterConfig.snapshot_interval()); - - StatisticsComponent stat = null; - for (Component component : qrCluster.getAllComponents()) { - if (component.getClassId().getName().contains("com.yahoo.statistics.StatisticsImpl")) { - stat = (StatisticsComponent) component; - break; - } - } - assertNotNull(stat); - StatisticsConfig.Builder sb = new StatisticsConfig.Builder(); - stat.getConfig(sb); - StatisticsConfig sc = new StatisticsConfig(sb); - assertEquals(60, (int) sc.collectionintervalsec()); - assertEquals(60, (int) sc.loggingintervalsec()); - } - - @Test - public void testStatisticsConfig() { - StatisticsComponent stat = new StatisticsComponent(); - StatisticsConfig.Builder sb = new StatisticsConfig.Builder(); - stat.getConfig(sb); - StatisticsConfig sc = new StatisticsConfig(sb); - assertEquals(sc.collectionintervalsec(), 300, 0.1); - assertEquals(sc.loggingintervalsec(), 300, 0.1); - assertEquals(sc.values(0).operations(0).name(), StatisticsConfig.Values.Operations.Name.REGULAR); - assertEquals(sc.values(0).operations(0).arguments(0).key(), "limits"); - assertEquals(sc.values(0).operations(0).arguments(0).value(), "25,50,100,500"); } @Test 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 29cff23d3bd..ada8e2c210b 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 @@ -8,7 +8,6 @@ import com.yahoo.config.ConfigInstance; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.config.model.test.MockRoot; -import com.yahoo.container.StatisticsConfig; import com.yahoo.container.di.config.PlatformBundlesConfig; import com.yahoo.container.jdisc.config.HealthMonitorConfig; import com.yahoo.net.HostName; @@ -89,13 +88,6 @@ public class ConfigserverClusterTest { } @Test - public void testStatisticsConfig() { - StatisticsConfig config = getConfig(StatisticsConfig.class); - assertEquals(60, (int) config.collectionintervalsec()); - assertEquals(60, (int) config.loggingintervalsec()); - } - - @Test public void testHealthMonitorConfig() { HealthMonitorConfig config = getConfig(HealthMonitorConfig.class); assertEquals(60, (int) config.snapshot_interval()); |