From 66cc2e3c89d83225e699966ac378b43becdbf4d8 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sat, 12 Oct 2019 22:32:04 +0200 Subject: Test at the cluster level instead as that is where config is produced. --- .../MetricsProxyContainerClusterTest.java | 21 +++++++++++++---- .../metricsproxy/MetricsProxyContainerTest.java | 27 +++++++--------------- .../metricsproxy/MetricsProxyModelTester.java | 6 +++++ 3 files changed, 31 insertions(+), 23 deletions(-) (limited to 'config-model') diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java index 34530b598df..737e7b197bf 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java @@ -41,6 +41,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.c import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getApplicationDimensionsConfig; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getCustomConsumer; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel; +import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.configId; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getQrStartConfig; import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicConsumer.DEFAULT_PUBLIC_CONSUMER_ID; import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicMetrics.defaultPublicMetricSet; @@ -93,11 +94,23 @@ public class MetricsProxyContainerClusterTest { assertEquals(MockApplicationPackage.DEPLOYED_BY_USER, config.user()); } + private void metrics_proxy_has_expected_qr_start_options(MetricsProxyModelTester.TestMode mode) { + VespaModel model = getModel(servicesWithAdminOnly(), mode); + QrStartConfig qrStartConfig = getQrStartConfig(model); + assertEquals(512, qrStartConfig.jvm().heapsize()); + assertEquals(0, qrStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory()); + assertEquals(2, qrStartConfig.jvm().availableProcessors()); + assertEquals(false, qrStartConfig.jvm().verbosegc()); + assertEquals("-XX:+UseG1GC -XX:MaxTenuringThreshold=15", qrStartConfig.jvm().gcopts()); + assertEquals(512, qrStartConfig.jvm().stacksize()); + assertEquals(0, qrStartConfig.jvm().directMemorySizeCache()); + assertEquals(75, qrStartConfig.jvm().baseMaxDirectMemorySize()); + } + @Test - public void verbose_gc_logging_is_disabled() { - VespaModel model = getModel(servicesWithAdminOnly(), self_hosted); - QrStartConfig config = getQrStartConfig(model); - assertFalse(config.jvm().verbosegc()); + public void metrics_proxy_has_expected_qr_start_options() { + metrics_proxy_has_expected_qr_start_options(self_hosted); + metrics_proxy_has_expected_qr_start_options(hosted); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java index 352a6a624ae..6802c47787a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.admin.metricsproxy; import ai.vespa.metricsproxy.metric.dimensions.NodeDimensionsConfig; import ai.vespa.metricsproxy.rpc.RpcConnectorConfig; import ai.vespa.metricsproxy.service.VespaServicesConfig; -import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames; import com.yahoo.vespa.model.test.VespaModelTester; @@ -15,6 +14,8 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.C import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.hosted; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.self_hosted; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel; +import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.configId; + import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getNodeDimensionsConfig; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getRpcConnectorConfig; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getVespaServicesConfig; @@ -49,27 +50,15 @@ public class MetricsProxyContainerTest { } } - @Test - public void metrics_proxy_requires_less_memory_than_other_containers() { - VespaModel model = getModel(servicesWithContent(), self_hosted); - MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID); + private void metrics_proxy_requires_less_memory_than_other_containers(MetricsProxyModelTester.TestMode mode) { + VespaModel model = getModel(servicesWithContent(), mode); + MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(configId(model, mode)); assertThat(container.getStartupCommand(), containsString("-Xms32m")); } - @Test - public void metrics_proxy_has_expected_qr_start_options() { - VespaModel model = getModel(servicesWithContent(), self_hosted); - QrStartConfig.Builder qrBuilder = new QrStartConfig.Builder(); - model.getConfig(qrBuilder, CONTAINER_CONFIG_ID); - QrStartConfig qrStartConfig = new QrStartConfig(qrBuilder); - assertEquals(512, qrStartConfig.jvm().heapsize()); - assertEquals(0, qrStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory()); - assertEquals(2, qrStartConfig.jvm().availableProcessors()); - assertEquals(false, qrStartConfig.jvm().verbosegc()); - assertEquals("-XX:+UseG1GC -XX:MaxTenuringThreshold=15", qrStartConfig.jvm().gcopts()); - assertEquals(512, qrStartConfig.jvm().stacksize()); - assertEquals(0, qrStartConfig.jvm().directMemorySizeCache()); - assertEquals(75, qrStartConfig.jvm().baseMaxDirectMemorySize()); + public void metrics_proxy_requires_less_memory_than_other_containers() { + metrics_proxy_requires_less_memory_than_other_containers(self_hosted); + metrics_proxy_requires_less_memory_than_other_containers(hosted); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java index 5fe62e6bd1b..41021eb3a65 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java @@ -47,6 +47,12 @@ class MetricsProxyModelTester { return tester.createModel(servicesXml, true); } + static String configId(VespaModel model, MetricsProxyModelTester.TestMode mode) { + return (mode == hosted) + ? CLUSTER_CONFIG_ID + "/" + model.getHosts().iterator().next().getHostname() + : CONTAINER_CONFIG_ID; + } + static boolean checkMetric(ConsumersConfig.Consumer consumer, Metric metric) { for (ConsumersConfig.Consumer.Metric m : consumer.metric()) { if (metric.name.equals(m.name()) && metric.outputName.equals(m.outputname())) -- cgit v1.2.3