qrserver -> container, part 2

18 files changed, 33 insertions, 45 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
index 5e10001baf6..2ff6a8f4505 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
@@ -33,7 +33,7 @@ public class DefaultMetrics {
         return ImmutableSet.<Metric>builder()
                 .addAll(getContentMetrics())
                 .addAll(getContainerMetrics())
-                .addAll(getQrserverMetrics())
+                .addAll(getSearchMetrics())
                 .build();
     }
 
@@ -51,7 +51,7 @@ public class DefaultMetrics {
         return metrics;
     }
 
-    private static Set<Metric> getQrserverMetrics() {
+    private static Set<Metric> getSearchMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
 
         metrics.add(new Metric("queries.rate"));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index 6ce8c54f98c..60b86b9785f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -28,7 +28,7 @@ public class VespaMetricSet {
         metrics.addAll(getDistributorMetrics());
         metrics.addAll(getDocprocMetrics());
         metrics.addAll(getClusterControllerMetrics());
-        metrics.addAll(getQrserverMetrics());
+        metrics.addAll(getSearchMetrics());
         metrics.addAll(getContainerMetrics());
         metrics.addAll(getConfigServerMetrics());
         metrics.addAll(getSentinelMetrics());
@@ -297,7 +297,7 @@ public class VespaMetricSet {
         return metrics;
     }
 
-    private static Set<Metric> getQrserverMetrics() {
+    private static Set<Metric> getSearchMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
 
         metrics.add(new Metric("peak_qps.max"));
@@ -351,7 +351,7 @@ public class VespaMetricSet {
         metrics.add(new Metric("relevance.at_10.sum"));
         metrics.add(new Metric("relevance.at_10.count"));
 
-        // Errors from qrserver
+        // Errors from search container
         metrics.add(new Metric("error.timeout.rate"));
         metrics.add(new Metric("error.backends_oos.rate"));
         metrics.add(new Metric("error.plugin_failure.rate"));
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
index 9721e85c71d..05b8681b5fa 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
@@ -98,7 +98,7 @@ public class HostsXmlProvisionerTest {
         return createAliases(new ArrayList<>());
     }
 
-    // Admin services on node1, qrserver on node2 + additional specs
+    // Admin services on node1, container on node2 + additional specs
     private List<String> createAliases(Collection<String> additionalAliases) {
         ArrayList<String> aliases = new ArrayList<>();
         aliases.add("node1");
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
index 00acc715a39..e5f6235552f 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
@@ -93,7 +93,7 @@ public class SingleNodeProvisionerTest {
         return createAliases(new ArrayList<String>());
     }
 
-    // Admin services on node1, qrserver on node2 + additional specs
+    // Admin services on node1, container on node2 + additional specs
     private List<String> createAliases(Collection<String> additionalAliases) {
         List<String> aliases = new ArrayList<>();
         aliases.add("node1");
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 7f17f5cdd41..0848b8becb9 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
@@ -211,12 +211,6 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertServices(h, expectedServices);
 
         assertEquals(musicClusterId + "/storage/0", h.getService("storagenode").getConfigId());
-
-        /* Not yet
-        assertNotNull(h.getService("qrserver"));
-        assertNotNull(h.getService("docproc"));
-        */
-
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
index a46fafe30c4..97951ab5a20 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
@@ -45,7 +45,7 @@ public class VespaDomBuilderTest {
             "  <container version=\"1.0\">" +
             "      <config name=\"a.standard\">" +
             "        <basicStruct>" +
-            "          <stringVal>qrservers</stringVal>" +
+            "          <stringVal>foo</stringVal>" +
             "        </basicStruct>" +
             "      </config> " +
             "    <nodes>\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 8e871bb432b..bd067fa3e63 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -8,7 +8,6 @@ import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
 import com.yahoo.container.jdisc.JdiscBindingsConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
-import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.search.GUIHandler;
@@ -17,12 +16,15 @@ import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Element;
 
-import static com.yahoo.config.model.api.container.ContainerServiceType.CONTAINER;
 import static com.yahoo.test.Matchers.hasItemWithMethod;
 import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILE_REGISTRY_CLASS;
 import static org.hamcrest.MatcherAssert.assertThat;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author gjoranv
@@ -105,14 +107,6 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         assertNull(discBindingsConfig.handlers(SearchHandler.HANDLER_CLASS));
     }
 
-    // TODO: remove test when all containers are named 'container'
-    @Test
-    void cluster_with_only_search_gets_qrserver_as_service_name() {
-        createClusterWithOnlyDefaultChains();
-        ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get("default");
-        assertEquals(CONTAINER.serviceName, cluster.getContainers().get(0).getServiceName());
-    }
-
     @Test
     void empty_search_element_gives_default_chains() {
         createClusterWithOnlyDefaultChains();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index f65a72427de..96aa88303bf 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -130,7 +130,7 @@ public class IndexedTest extends ContentBaseTest {
         // HostResource h = model.getHostSystem().getHosts().get(0);
         // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok",
         //                               "logd", "configproxy","config-sentinel",
-        //                               "qrserver", "fleetcontroller",
+        //                               "container", "fleetcontroller",
         //                               "storagenode", "searchnode", "distributor", "transactionlogserver"};
         // DomContentBuilderTest.assertServices(h, expectedServices);
         Routing routing = model.getRouting();
@@ -159,7 +159,7 @@ public class IndexedTest extends ContentBaseTest {
         // HostResource h = model.getHostSystem().getHosts().get(0);
         // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok",
         //                               "logd", "configproxy","config-sentinel",
-        //                               "qrserver", "storagenode", "searchnode", "distributor",
+        //                               "container", "storagenode", "searchnode", "distributor",
         //                               "transactionlogserver"};
         // DomContentBuilderTest.assertServices(h, expectedServices);
         ContentCluster s = model.getContentClusters().get("test");
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index d794fa4e27f..2a0d62a1c9a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -334,7 +334,7 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica
     }
 
     /**
-     * Given baseIdSegment search/ and id search/qrservers/default.0, return search/qrservers
+     * Given baseIdSegment search/ and id search/container/default.0, return search/container
      * @return id segment with one extra level from the id appended
      */
     String appendOneLevelOfId(String baseIdSegment, String id) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
index 472c47c22eb..85e64b4a32d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
@@ -248,10 +248,10 @@ public class TenantApplicationsTest {
     @Test
     public void testAppendIdsInNonRecursiveListing() {
         TenantApplications applications = createTenantApplications(tenantName, curator, configserverConfig, new MockConfigActivationListener(), new InMemoryFlagSource());
-        assertEquals(applications.appendOneLevelOfId("search/music", "search/music/qrservers/default/qr.0"), "search/music/qrservers");
-        assertEquals(applications.appendOneLevelOfId("search", "search/music/qrservers/default/qr.0"), "search/music");
-        assertEquals(applications.appendOneLevelOfId("search/music/qrservers/default/qr.0", "search/music/qrservers/default/qr.0"), "search/music/qrservers/default/qr.0");
-        assertEquals(applications.appendOneLevelOfId("", "search/music/qrservers/default/qr.0"), "search");
+        assertEquals(applications.appendOneLevelOfId("search/music", "search/music/container/default/qr.0"), "search/music/container");
+        assertEquals(applications.appendOneLevelOfId("search", "search/music/container/default/qr.0"), "search/music");
+        assertEquals(applications.appendOneLevelOfId("search/music/container/default/qr.0", "search/music/container/default/qr.0"), "search/music/container/default/qr.0");
+        assertEquals(applications.appendOneLevelOfId("", "search/music/container/default/qr.0"), "search");
     }
 
     @Test
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh
index ccc382ab1bf..7145a7d2603 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -27,7 +27,7 @@ else
 fi
 CONTAINER_HOME="${VESPA_HOME}/var/jdisc_container/${DISCRIMINATOR}/"
 
-if [[ "$VESPA_SERVICE_NAME" = "container" || "$VESPA_SERVICE_NAME" = "container-clustercontroller" || "$VESPA_SERVICE_NAME" = "qrserver" ]]; then
+if [[ "$VESPA_SERVICE_NAME" = "container" || "$VESPA_SERVICE_NAME" = "container-clustercontroller" ]]; then
     ZOOKEEPER_LOG_FILE_PREFIX="${VESPA_HOME}/logs/vespa/zookeeper.${VESPA_SERVICE_NAME}"
     rm -f $ZOOKEEPER_LOG_FILE_PREFIX*lck
     zookeeper_log_file_property="-Dzookeeper_log_file_prefix=${ZOOKEEPER_LOG_FILE_PREFIX}"
diff --git a/controller-server/src/test/resources/horizon/filters-complex.expected.json b/controller-server/src/test/resources/horizon/filters-complex.expected.json
index b3416f8a410..30ee6a28d7e 100644
--- a/controller-server/src/test/resources/horizon/filters-complex.expected.json
+++ b/controller-server/src/test/resources/horizon/filters-complex.expected.json
@@ -7,7 +7,7 @@
    "type": "TimeSeriesDataSource",
    "metric": {
     "type": "MetricLiteral",
-    "metric": "Vespa.vespa.qrserver.documents_covered.count"
+    "metric": "Vespa.vespa.container.documents_covered.count"
    },
    "sourceId": null,
    "fetchLast": false,
diff --git a/controller-server/src/test/resources/horizon/filters-complex.json b/controller-server/src/test/resources/horizon/filters-complex.json
index 3acc7fe5044..e21fa61128a 100644
--- a/controller-server/src/test/resources/horizon/filters-complex.json
+++ b/controller-server/src/test/resources/horizon/filters-complex.json
@@ -7,7 +7,7 @@
       "type": "TimeSeriesDataSource",
       "metric": {
         "type": "MetricLiteral",
-        "metric": "Vespa.vespa.qrserver.documents_covered.count"
+        "metric": "Vespa.vespa.container.documents_covered.count"
       },
       "sourceId": null,
       "fetchLast": false,
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java
index 64a21a54999..dd249c4a21f 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java
@@ -54,12 +54,12 @@ public class MetricsFormatter {
         return name;
     }
 
-    // E.g. container/qrserver.1 ->  'container.qrserver.1'
+    // E.g. container/default.1 ->  'container.default.1'
     private static String toServiceId(String configId) {
         return "'" + configId.replace("/", ".") + "'";
     }
 
-    // E.g. container/qrserver.1 ->  container.'qrserver.1'
+    // E.g. container/default.1 ->  container.'default.1'
     private static String toSystemServiceId(String configId) {
         String name = configId.replace("/", ".");
         name = name.replaceFirst("\\.", ".'") + "'";
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
index 4d1fb802afc..2e7f7c7a936 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
@@ -188,7 +188,7 @@ public class ApplicationMetricsHandlerTest {
         assertEquals("us-west", dimensions.get(PublicDimensions.ZONE));
         assertEquals("search/", dimensions.get(PublicDimensions.API));
         assertEquals("music", dimensions.get(PublicDimensions.DOCUMENT_TYPE));
-        assertEquals("qrserver0", dimensions.get(PublicDimensions.SERVICE_ID));
+        assertEquals("default0", dimensions.get(PublicDimensions.SERVICE_ID));
         assertFalse(dimensions.containsKey("non-public"));
     }
 
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java
index 71a4466ea95..8c8a44deae6 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java
@@ -49,19 +49,19 @@ public class RpcHealthMetricsTest {
             List<VespaService> services = tester.vespaServices().getInstancesById(SERVICE_1_CONFIG_ID);
 
             assertEquals(1, services.size());
-            VespaService qrserver = services.get(0);
-            HealthMetric h = qrserver.getHealth();
+            VespaService container = services.get(0);
+            HealthMetric h = container.getHealth();
             assertNotNull("Health metric should never be null", h);
             assertTrue("Status failed, reason = " + h.getMessage(), h.isOk());
             assertEquals("WORKING", h.getMessage());
 
             mockHttpServer.setResponse(HEALTH_FAILED_RESPONSE);
-            h = qrserver.getHealth();
+            h = container.getHealth();
             assertNotNull("Health metric should never be null", h);
             assertFalse("Status should be failed" + h.getMessage(), h.isOk());
             assertEquals("SOMETHING FAILED", h.getMessage());
 
-            String jsonRPCMessage = getHealthMetrics(tester, qrserver.getMonitoringName().id);
+            String jsonRPCMessage = getHealthMetrics(tester, container.getMonitoringName().id);
             assertEquals(WANTED_RPC_RESPONSE, jsonRPCMessage);
         }
     }
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java
index 5d21fb46ae3..a2a4852ace4 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java
@@ -11,7 +11,7 @@ public class ConfigSentinelDummy {
                     + "fleetcontroller state=RUNNING mode=AUTO pid=6543 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"storage/cluster.storage/fleetcontroller/0\"\n"
                     + "storagenode state=RUNNING mode=AUTO pid=6539 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"storage/cluster.storage/storage/0\"\n"
                     + "searchnode4 state=RUNNING mode=AUTO pid=6534 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c1/r1\"\n"
-                    + "qrserver2 state=RUNNING mode=AUTO pid=6521 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/qrserver.1\"\n"
+                    + "container2 state=RUNNING mode=AUTO pid=6521 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/default.1\"\n"
                     + "logserver state=RUNNING mode=AUTO pid=6518 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"admin/logserver\"\n"
                     + "logd state=RUNNING mode=AUTO pid=6517 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"hosts/dell-bl5s7.trondheim.corp.yahoo.com/logd\"\n"
                     + "searchnode2 state=RUNNING mode=AUTO pid=6527 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c0/r1\"\n"
diff --git a/metrics-proxy/src/test/resources/generic-sample.json b/metrics-proxy/src/test/resources/generic-sample.json
index c9b02696e69..13302121507 100644
--- a/metrics-proxy/src/test/resources/generic-sample.json
+++ b/metrics-proxy/src/test/resources/generic-sample.json
@@ -36,7 +36,7 @@
             "applicationId": "music.default",
             "clustertype": "container",
             "clusterid": "default",
-            "instance": "qrserver0",
+            "instance": "default0",
             "zone": "us-west",
             "api": "search/",
             "documenttype": "music",