diff options
Diffstat (limited to 'config-model/src')
13 files changed, 94 insertions, 46 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java index b5cadedd454..dea2095d8e4 100644 --- a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java +++ b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java @@ -49,8 +49,8 @@ public class AdminModel extends ConfigModel { public void prepare(ConfigModelRepo configModelRepo, DeployState deployState) { verifyClusterControllersOnlyDefinedForContent(configModelRepo); if (admin == null) return; - if (admin.getClusterControllers() != null) - admin.getClusterControllers().prepare(deployState); + if (admin.getClusterControllers() != null) admin.getClusterControllers().prepare(deployState); + if (admin.getMetricsProxyCluster() != null) admin.getMetricsProxyCluster().prepare(deployState); admin.getLogServerContainerCluster().ifPresent((ContainerCluster cc) -> cc.prepare(deployState)); } diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java index ca6bdee82cf..b381a5f28db 100644 --- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java +++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java @@ -42,6 +42,9 @@ import java.util.stream.Collectors; */ public class MockApplicationPackage implements ApplicationPackage { + public static final String DEPLOYED_BY_USER = "user"; + public static final String APPLICATION_NAME = "application"; + public static final long APPLICATION_GENERATION = 1L; public static final String MUSIC_SEARCHDEFINITION = createSearchDefinition("music", "foo"); public static final String BOOK_SEARCHDEFINITION = createSearchDefinition("book", "bar"); @@ -70,7 +73,7 @@ public class MockApplicationPackage implements ApplicationPackage { this.failOnValidateXml = failOnValidateXml; queryProfileRegistry = new QueryProfileXMLReader().read(asNamedReaderList(queryProfileType), asNamedReaderList(queryProfile)); - applicationMetaData = new ApplicationMetaData("user", "dir", 0L, false, "application", "checksum", 1L, 0L); + applicationMetaData = new ApplicationMetaData(DEPLOYED_BY_USER, "dir", 0L, false, APPLICATION_NAME, "checksum", APPLICATION_GENERATION, 0L); } /** Returns the root of this application package relative to the current dir */ diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index 6183701e36e..44c10b0738b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -45,9 +45,11 @@ public class Admin extends AbstractConfigProducer implements Serializable { private final boolean isHostedVespa; private final Monitoring monitoring; + private final List<Configserver> configservers = new ArrayList<>(); + private final Metrics metrics; + private MetricsProxyContainerCluster metricsProxyCluster; private MetricSet additionalDefaultMetrics = emptyMetricSet(); - private final List<Configserver> configservers = new ArrayList<>(); private final List<Slobrok> slobroks = new ArrayList<>(); private Configserver defaultConfigserver; @@ -99,6 +101,10 @@ public class Admin extends AbstractConfigProducer implements Serializable { public Metrics getUserMetrics() { return metrics; } + public MetricsProxyContainerCluster getMetricsProxyCluster() { + return metricsProxyCluster; + } + public void setAdditionalDefaultMetrics(MetricSet additionalDefaultMetrics) { if (additionalDefaultMetrics == null) return; this.additionalDefaultMetrics = additionalDefaultMetrics; @@ -202,8 +208,7 @@ public class Admin extends AbstractConfigProducer implements Serializable { if (slobroks.isEmpty()) // TODO: Move to caller slobroks.addAll(createDefaultSlobrokSetup(deployState.getDeployLogger())); - if (deployState.getProperties().enableMetricsProxyContainer()) - addMetricsProxyCluster(hosts, deployState); + addMetricsProxyCluster(hosts, deployState); for (HostResource host : hosts) { if (!host.getHost().runsConfigServer()) { @@ -213,7 +218,7 @@ public class Admin extends AbstractConfigProducer implements Serializable { } private void addMetricsProxyCluster(List<HostResource> hosts, DeployState deployState) { - var metricsProxyCluster = new MetricsProxyContainerCluster(this, "metrics", deployState); + metricsProxyCluster = new MetricsProxyContainerCluster(this, "metrics", deployState); int index = 0; for (var host : hosts) { var container = new MetricsProxyContainer(metricsProxyCluster, index++, deployState.isHosted()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index 558e0cdb3c2..dccd19e7c63 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -20,6 +20,7 @@ import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Zone; +import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.admin.monitoring.MetricSet; @@ -56,7 +57,8 @@ import static com.yahoo.vespa.model.container.xml.BundleMapper.absoluteBundlePat public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyContainer> implements ApplicationDimensionsConfig.Producer, ConsumersConfig.Producer, - MonitoringConfig.Producer + MonitoringConfig.Producer, + QrStartConfig.Producer { public static final Logger log = Logger.getLogger(MetricsProxyContainerCluster.class.getName()); @@ -123,6 +125,14 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC } } + // Switch off verbose:gc, because it's very noisy when Xms < Xmx + @Override + public void getConfig(QrStartConfig.Builder builder) { + super.getConfig(builder); + // This takes effect via vespa-start-container-daemon:configure_gcopts + builder.jvm.verbosegc(false); + } + private MetricSet getAdditionalDefaultMetrics() { return getAdmin() .map(Admin::getAdditionalDefaultMetrics) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 04533836739..1080a1c3990 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -69,6 +69,7 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -506,23 +507,16 @@ public abstract class ContainerCluster<CONTAINER extends Container> @Override public void getConfig(QrStartConfig.Builder builder) { - QrStartConfig.Jvm.Builder jvmBuilder = new QrStartConfig.Jvm.Builder(); + QrStartConfig.Jvm.Builder jvmBuilder = builder.jvm; if (getMemoryPercentage().isPresent()) { jvmBuilder.heapSizeAsPercentageOfPhysicalMemory(getMemoryPercentage().get()); } else if (isHostedVespa()) { jvmBuilder.heapSizeAsPercentageOfPhysicalMemory(getHostClusterId().isPresent() ? 17 : 60); } - if (jvmGCOptions != null) { - jvmBuilder.gcopts(jvmGCOptions); - } else { - jvmBuilder.gcopts(G1GC); - } + jvmBuilder.gcopts(Objects.requireNonNullElse(jvmGCOptions, G1GC)); if (environmentVars != null) { - QrStartConfig.Qrs.Builder qrsBuilder = new QrStartConfig.Qrs.Builder(); - qrsBuilder.env(environmentVars); - builder.qrs(qrsBuilder); + builder.qrs.env(environmentVars); } - builder.jvm(jvmBuilder); } @Override diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java index dc72fb8a42b..074ff610e9a 100644 --- a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java @@ -116,7 +116,7 @@ public class SystemModelTestCase { // all three host aliases are for the same host, so the number of services should be 3 + 8 // (3 simpleservices and logd, configproxy, config sentinel, admin server config server, slobrok, logserver and metricsproxy) - assertEquals(9, host1.getServices().size()); + assertEquals(10, host1.getServices().size()); assertNotNull(host1.getService("simpleservice")); assertNotNull(host1.getService("simpleservice2")); 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 b7ceb0923b7..a490b7afd4c 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 @@ -29,6 +29,7 @@ import org.junit.Test; import java.util.Set; +import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -101,12 +102,12 @@ public class AdminTestCase { SentinelConfig.Builder b = new SentinelConfig.Builder(); vespaModel.getConfig(b, localhostConfigId); SentinelConfig sentinelConfig = new SentinelConfig(b); - assertThat(sentinelConfig.service().size(), is(4)); + assertThat(sentinelConfig.service().size(), is(5)); assertThat(sentinelConfig.service(0).name(), is("logserver")); assertThat(sentinelConfig.service(1).name(), is("slobrok")); assertThat(sentinelConfig.service(2).name(), is("slobrok2")); - //assertThat(sentinelConfig.service(3).name(), is(METRICS_PROXY_CONTAINER.serviceName)); - assertThat(sentinelConfig.service(3).name(), is("logd")); + assertThat(sentinelConfig.service(3).name(), is(METRICS_PROXY_CONTAINER.serviceName)); + assertThat(sentinelConfig.service(4).name(), is("logd")); } /** @@ -137,11 +138,11 @@ public class AdminTestCase { SentinelConfig.Builder b = new SentinelConfig.Builder(); vespaModel.getConfig(b, localhostConfigId); SentinelConfig sentinelConfig = new SentinelConfig(b); - assertThat(sentinelConfig.service().size(), is(3)); + assertThat(sentinelConfig.service().size(), is(4)); assertThat(sentinelConfig.service(0).name(), is("logserver")); assertThat(sentinelConfig.service(1).name(), is("slobrok")); - //assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName)); - assertThat(sentinelConfig.service(2).name(), is("logd")); + assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName)); + assertThat(sentinelConfig.service(3).name(), is("logd")); assertThat(sentinelConfig.service(0).affinity().cpuSocket(), is(-1)); assertTrue(sentinelConfig.service(0).preShutdownCommand().isEmpty()); @@ -292,11 +293,11 @@ public class AdminTestCase { TestRoot root = new TestDriver().buildModel(state); String localhost = HostName.getLocalhost(); SentinelConfig sentinelConfig = root.getConfig(SentinelConfig.class, "hosts/" + localhost); - assertThat(sentinelConfig.service().size(), is(3)); + assertThat(sentinelConfig.service().size(), is(4)); assertThat(sentinelConfig.service(0).name(), is("logserver")); assertThat(sentinelConfig.service(1).name(), is("slobrok")); - //assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName)); - assertThat(sentinelConfig.service(2).name(), is("logd")); + assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName)); + assertThat(sentinelConfig.service(3).name(), is("logd")); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java index fc10e941091..77f31993a7f 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java @@ -75,10 +75,13 @@ public class DedicatedAdminV4Test { VespaModel model = createModel(hosts, services); assertEquals(3, model.getHosts().size()); - assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd"); - assertHostContainsServices(model, "hosts/myhost1", "slobrok", "logd"); - // Note: A container is always added on logserver host - assertHostContainsServices(model, "hosts/myhost2", "logserver", "logd", LOGSERVER_CONTAINER.serviceName); + assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", + METRICS_PROXY_CONTAINER.serviceName); + assertHostContainsServices(model, "hosts/myhost1", "slobrok", "logd", + METRICS_PROXY_CONTAINER.serviceName); + // Note: A logserver container is always added on logserver host + assertHostContainsServices(model, "hosts/myhost2", "logserver", "logd", + METRICS_PROXY_CONTAINER.serviceName, LOGSERVER_CONTAINER.serviceName); Monitoring monitoring = model.getAdmin().getMonitoring(); assertEquals("vespa.routing", monitoring.getClustername()); @@ -131,13 +134,13 @@ public class DedicatedAdminV4Test { // 4 slobroks, 2 per cluster where possible assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver", - QRSERVER.serviceName); + METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName); assertHostContainsServices(model, "hosts/myhost1", "slobrok", "logd", - QRSERVER.serviceName); + METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName); assertHostContainsServices(model, "hosts/myhost2", "slobrok", "logd", - QRSERVER.serviceName); + METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName); assertHostContainsServices(model, "hosts/myhost3", "slobrok", "logd", - QRSERVER.serviceName); + METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName); } @Test @@ -155,10 +158,13 @@ public class DedicatedAdminV4Test { VespaModel model = createModel(hosts, services); assertEquals(3, model.getHosts().size()); - assertHostContainsServices(model, "hosts/myhost0", "logd", "logforwarder", "slobrok"); - assertHostContainsServices(model, "hosts/myhost1", "logd", "logforwarder", "slobrok"); - // Note: A container is always added on logserver host - assertHostContainsServices(model, "hosts/myhost2", "logd", "logforwarder", "logserver", LOGSERVER_CONTAINER.serviceName); + assertHostContainsServices(model, "hosts/myhost0", "logd", "logforwarder", "slobrok", + METRICS_PROXY_CONTAINER.serviceName); + assertHostContainsServices(model, "hosts/myhost1", "logd", "logforwarder", "slobrok", + METRICS_PROXY_CONTAINER.serviceName); + // Note: A logserver container is always added on logserver host + assertHostContainsServices(model, "hosts/myhost2", "logd", "logforwarder", "logserver", + METRICS_PROXY_CONTAINER.serviceName, LOGSERVER_CONTAINER.serviceName); Set<String> configIds = model.getConfigIds(); // 1 logforwarder on each host @@ -203,8 +209,9 @@ public class DedicatedAdminV4Test { .zone(new Zone(SystemName.cd, Environment.dev, RegionName.defaultName())) .properties(new TestProperties().setHostedVespa(true))); assertEquals(1, model.getHosts().size()); - // Should create a container on the same node as logserver - assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver", LOGSERVER_CONTAINER.serviceName); + // Should create a logserver container on the same node as logserver + assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver", + METRICS_PROXY_CONTAINER.serviceName , LOGSERVER_CONTAINER.serviceName); } private Set<String> serviceNames(VespaModel model, String hostname) { 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 0ba5b51bfe1..a08c5394dda 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 @@ -6,8 +6,11 @@ package com.yahoo.vespa.model.admin.metricsproxy; import ai.vespa.metricsproxy.core.ConsumersConfig; import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensionsConfig; +import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.provision.Zone; import com.yahoo.container.BundlesConfig; +import com.yahoo.container.core.ApplicationMetadataConfig; +import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames; import com.yahoo.vespa.model.admin.monitoring.Metric; @@ -29,6 +32,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.g import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getCustomConsumer; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getHostedModel; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel; +import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getQrStartConfig; import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet; import static com.yahoo.vespa.model.admin.monitoring.NetworkMetrics.networkMetricSet; @@ -37,6 +41,7 @@ import static com.yahoo.vespa.model.admin.monitoring.VespaMetricSet.vespaMetricS import static java.util.Collections.singleton; import static org.hamcrest.CoreMatchers.endsWith; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -65,6 +70,24 @@ public class MetricsProxyContainerClusterTest { } @Test + public void cluster_is_prepared_so_that_application_metadata_config_is_produced() { + VespaModel model = getModel(servicesWithAdminOnly()); + var builder = new ApplicationMetadataConfig.Builder(); + model.getConfig(builder, CLUSTER_CONFIG_ID); + ApplicationMetadataConfig config = builder.build(); + assertEquals(MockApplicationPackage.APPLICATION_GENERATION, config.generation()); + assertEquals(MockApplicationPackage.APPLICATION_NAME, config.name()); + assertEquals(MockApplicationPackage.DEPLOYED_BY_USER, config.user()); + } + + @Test + public void verbose_gc_logging_is_disabled() { + VespaModel model = getModel(servicesWithAdminOnly()); + QrStartConfig config = getQrStartConfig(model); + assertFalse(config.jvm().verbosegc()); + } + + @Test public void default_consumer_is_always_present_and_has_all_vespa_metrics_and_all_system_metrics() { ConsumersConfig config = consumersConfigFromXml(servicesWithAdminOnly()); assertEquals(config.consumer(0).name(), VESPA_CONSUMER_ID); 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 4fad2c09184..81b06e54585 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 @@ -11,6 +11,7 @@ import ai.vespa.metricsproxy.rpc.RpcConnectorConfig; import ai.vespa.metricsproxy.service.VespaServicesConfig; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provisioning.FlavorsConfig; +import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.monitoring.Metric; import com.yahoo.vespa.model.test.VespaModelTester; @@ -82,6 +83,10 @@ class MetricsProxyModelTester { return new ApplicationDimensionsConfig((ApplicationDimensionsConfig.Builder) model.getConfig(new ApplicationDimensionsConfig.Builder(), CLUSTER_CONFIG_ID)); } + static QrStartConfig getQrStartConfig(VespaModel model) { + return new QrStartConfig((QrStartConfig.Builder) model.getConfig(new QrStartConfig.Builder(), CLUSTER_CONFIG_ID)); + } + static NodeDimensionsConfig getNodeDimensionsConfig(VespaModel model) { return new NodeDimensionsConfig((NodeDimensionsConfig.Builder) model.getConfig(new NodeDimensionsConfig.Builder(), CONTAINER_CONFIG_ID)); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java index 01f868d2ad7..3fbfbf33fb3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java @@ -58,10 +58,10 @@ public class ConfigValueChangeValidatorTest { createVespaModel(createQrStartConfigSegment(true, 2096)), createVespaModel(createQrStartConfigSegment(false, 2096)) ); - assertEquals(2, changes.size()); + assertEquals(3, changes.size()); assertComponentsEquals(changes, "default/container.0", 0); assertComponentsEquals(changes, "admin/cluster-controllers/0", 1); - //assertComponentsEquals(changes, "admin/metrics/0", 2); + assertComponentsEquals(changes, "admin/metrics/metricsproxy.0", 2); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java index 6a5e3bcb9d6..e7a1cbd6d8b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java @@ -241,7 +241,7 @@ public class ContentBuilderTest extends DomBuilderTest { String [] expectedServices = { "logd", "configproxy", "config-sentinel", "configserver", "logserver", "slobrok", "storagenode", "distributor","searchnode","transactionlogserver", - CLUSTERCONTROLLER_CONTAINER.serviceName + CLUSTERCONTROLLER_CONTAINER.serviceName, METRICS_PROXY_CONTAINER.serviceName }; assertServices(h, expectedServices); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java index 5f6cec00b0c..a5284ac8720 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java @@ -265,7 +265,7 @@ public class VespaModelTestCase { assertThat(hosts.size(), is(1)); //logd, config proxy, sentinel, config server, slobrok, log server HostInfo host = hosts.iterator().next(); - assertThat(host.getServices().size(), is(6)); + assertThat(host.getServices().size(), is(7)); new LogdConfig((LogdConfig.Builder) model.getConfig(new LogdConfig.Builder(), "admin/model")); } |