diff options
6 files changed, 21 insertions, 40 deletions
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 443bd2433c1..10049daa541 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 @@ -229,7 +229,6 @@ public class ContentBuilderTest extends DomBuilderTest { /* Not yet assertNotNull(h.getService("qrserver")); - assertNotNull(h.getService("topleveldisptach")); assertNotNull(h.getService("docproc")); */ 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 504c3d9ba9c..5d4756c430d 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 @@ -143,7 +143,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", "topleveldispatch", + // "qrserver", "fleetcontroller", // "storagenode", "searchnode", "distributor", "transactionlogserver"}; // DomContentBuilderTest.assertServices(h, expectedServices); Routing routing = model.getRouting(); diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp index 415edf6defc..254fa94a8ec 100644 --- a/configutil/src/lib/configstatus.cpp +++ b/configutil/src/lib/configstatus.cpp @@ -165,7 +165,6 @@ ConfigStatus::action() if (!upToDate) { if (svc.type == "searchnode" || - svc.type == "topleveldispatch" || svc.type == "logd") { std::cerr << "[generation not up-to-date ignored]" << std::endl; diff --git a/configutil/src/tests/model_inspect/model.cfg b/configutil/src/tests/model_inspect/model.cfg index 388bae2256d..bc29226e494 100644 --- a/configutil/src/tests/model_inspect/model.cfg +++ b/configutil/src/tests/model_inspect/model.cfg @@ -115,35 +115,23 @@ hosts[0].services[11].ports[0].number 19106 hosts[0].services[11].ports[0].tags "status admin rpc rtx" hosts[0].services[11].ports[1].number 19107 hosts[0].services[11].ports[1].tags "unused" -hosts[0].services[12].name "topleveldispatch" -hosts[0].services[12].type "topleveldispatch" -hosts[0].services[12].configid "search/cluster.music/tlds/tld.0" -hosts[0].services[12].clustertype "search" -hosts[0].services[12].clustername "music" +hosts[0].services[12].name "docprocservice" +hosts[0].services[12].type "container" +hosts[0].services[12].configid "docproc/cluster.music.indexing/0" +hosts[0].services[12].clustertype "" +hosts[0].services[12].clustername "music.indexing" hosts[0].services[12].index 0 -hosts[0].services[12].ports[0].number 19108 -hosts[0].services[12].ports[0].tags "admin rpc" -hosts[0].services[12].ports[1].number 19109 -hosts[0].services[12].ports[1].tags "fs4" -hosts[0].services[12].ports[2].number 19110 -hosts[0].services[12].ports[2].tags "health json http" -hosts[0].services[13].name "docprocservice" -hosts[0].services[13].type "container" -hosts[0].services[13].configid "docproc/cluster.music.indexing/0" -hosts[0].services[13].clustertype "" -hosts[0].services[13].clustername "music.indexing" -hosts[0].services[13].index 0 -hosts[0].services[13].ports[0].number 19111 -hosts[0].services[13].ports[0].tags "state external query http" -hosts[0].services[13].ports[1].number 19112 -hosts[0].services[13].ports[1].tags "external status http" -hosts[0].services[13].ports[2].number 19113 -hosts[0].services[13].ports[2].tags "messaging rpc" -hosts[0].services[13].ports[3].number 19114 -hosts[0].services[13].ports[3].tags "external fileserver http" -hosts[0].services[13].ports[4].number 19115 -hosts[0].services[13].ports[4].tags "admin rpc" -hosts[0].services[13].ports[5].number 19116 -hosts[0].services[13].ports[5].tags "rmiregistry rmi" -hosts[0].services[13].ports[6].number 19117 -hosts[0].services[13].ports[6].tags "jmx rmi" +hosts[0].services[12].ports[0].number 19111 +hosts[0].services[12].ports[0].tags "state external query http" +hosts[0].services[12].ports[1].number 19112 +hosts[0].services[12].ports[1].tags "external status http" +hosts[0].services[12].ports[2].number 19113 +hosts[0].services[12].ports[2].tags "messaging rpc" +hosts[0].services[12].ports[3].number 19114 +hosts[0].services[12].ports[3].tags "external fileserver http" +hosts[0].services[12].ports[4].number 19115 +hosts[0].services[12].ports[4].tags "admin rpc" +hosts[0].services[12].ports[5].number 19116 +hosts[0].services[12].ports[5].tags "rmiregistry rmi" +hosts[0].services[12].ports[6].number 19117 +hosts[0].services[12].ports[6].tags "jmx rmi" diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java index 810596d6d0b..7c0302ae3dc 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java @@ -62,7 +62,7 @@ public class ConfigSentinelClientTest { } @Test - public void testElastic() throws Exception { + public void testElastic() { String response = "container state=RUNNING mode=AUTO pid=14338 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"get/container.0\"\n" + "container-clustercontroller state=RUNNING mode=AUTO pid=25020 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"admin/cluster-controllers/0\"\n" + "distributor state=RUNNING mode=AUTO pid=25024 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/distributor/0\"\n" + @@ -72,7 +72,6 @@ public class ConfigSentinelClientTest { "metricsproxy state=RUNNING mode=AUTO pid=13107 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"hosts/vespa19.dev.gq1.yahoo.com/metricsproxy\"\n" + "searchnode state=RUNNING mode=AUTO pid=25023 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/search/cluster.search/0\"\n" + "slobrok state=RUNNING mode=AUTO pid=25019 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"admin/slobrok.0\"\n" + - "topleveldispatch state=RUNNING mode=AUTO pid=25026 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/search/cluster.search/tlds/tld.0\"\n" + "\n"; ConfigSentinelDummy configsentinel = new ConfigSentinelDummy(response); 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 5c746521c1f..def57617f56 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 @@ -15,8 +15,6 @@ public class ConfigSentinelDummy { + "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" - + "topleveldispatch2 state=RUNNING mode=AUTO pid=6525 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/tlds/tld.1\"\n" - + "topleveldispatch state=RUNNING mode=AUTO pid=6524 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/tlds/tld.0\"\n" + "clustercontroller2 state=RUNNING mode=AUTO pid=6523 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/rtx/1\"\n" + "clustercontroller state=RUNNING mode=AUTO pid=6522 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/rtx/0\"\n" + "slobrok state=RUNNING mode=AUTO pid=6519 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"admin/slobrok.0\"\n" @@ -43,8 +41,6 @@ public class ConfigSentinelDummy { + "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" - + "topleveldispatch2 state=RUNNING mode=AUTO pid=6525 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/tlds/tld.1\"\n" - + "topleveldispatch state=RUNNING mode=AUTO pid=6524 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/tlds/tld.0\"\n" + "clustercontroller2 state=RUNNING mode=AUTO pid=6523 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/rtx/1\"\n" + "clustercontroller state=RUNNING mode=AUTO pid=6522 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/rtx/0\"\n" + "slobrok state=RUNNING mode=AUTO pid=6519 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"admin/slobrok.0\"\n" |