filedistributorservice does not exist anymore

4 files changed, 12 insertions, 28 deletions

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 14e3bd72dc7..731544bb30e 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
@@ -8,8 +8,6 @@ import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.documentmodel.NewDocumentType;
 import com.yahoo.messagebus.routing.RouteSpec;
 import com.yahoo.messagebus.routing.RoutingTableSpec;
-import com.yahoo.searchdefinition.parser.ParseException;
-import com.yahoo.vespa.configdefinition.SpecialtokensConfig;
 import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
@@ -20,9 +18,7 @@ import com.yahoo.vespa.model.search.IndexedSearchCluster;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -110,22 +106,22 @@ public class IndexedTest extends ContentBaseTest {
         return createVespaServices(pre, sdNames, post, "streaming");
     }
 
-    private VespaModel getIndexedVespaModel() throws ParseException, IOException, SAXException {
+    private VespaModel getIndexedVespaModel() {
         return getIndexedVespaModelCreator().create();
     }
 
-    private VespaModelCreatorWithMockPkg getIndexedVespaModelCreator() throws ParseException, IOException, SAXException {
+    private VespaModelCreatorWithMockPkg getIndexedVespaModelCreator() {
         List<String> sds = ApplicationPackageUtils.generateSearchDefinitions("type1", "type2", "type3");
         return new VespaModelCreatorWithMockPkg(getHosts(), createProtonIndexedVespaServices(Arrays.asList("type1", "type2", "type3")), sds);
     }
 
-    private VespaModel getStreamingVespaModel() throws ParseException, IOException, SAXException {
+    private VespaModel getStreamingVespaModel() {
         List<String> sds = ApplicationPackageUtils.generateSearchDefinitions("type1");
         return new VespaModelCreatorWithMockPkg(getHosts(), createProtonStreamingVespaServices(Arrays.asList("type1")), sds).create();
     }
 
     @Test
-    public void requireMultipleDocumentTypes() throws ParseException, IOException, SAXException {
+    public void requireMultipleDocumentTypes() {
         VespaModelCreatorWithMockPkg creator = getIndexedVespaModelCreator();
         VespaModel model = creator.create();
         DeployState deployState = creator.deployState;
@@ -140,11 +136,11 @@ public class IndexedTest extends ContentBaseTest {
     }
 
     @Test
-    public void requireIndexedOnlyServices() throws ParseException, IOException, SAXException {
+    public void requireIndexedOnlyServices() {
         VespaModel model = getIndexedVespaModel();
         HostResource h = model.getHostSystem().getHosts().get(0);
         String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok",
-                                      "logd", "configproxy","config-sentinel", "filedistributorservice",
+                                      "logd", "configproxy","config-sentinel",
                                       "qrserver", "fleetcontroller", "topleveldispatch", "docprocservice",
                                       "storagenode", "searchnode", "distributor", "transactionlogserver"};
         // TODO DomContentBuilderTest.assertServices(h, expectedServices);
@@ -182,12 +178,12 @@ public class IndexedTest extends ContentBaseTest {
         assertEquals("[Content:cluster=test]", r.getHop(1));
     }
     @Test
-    public void requireProtonStreamingOnly() throws ParseException, IOException, SAXException
+    public void requireProtonStreamingOnly()
     {
         VespaModel model = getStreamingVespaModel();
         HostResource h = model.getHostSystem().getHosts().get(0);
         String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok",
-                                      "logd", "configproxy","config-sentinel", "filedistributorservice",
+                                      "logd", "configproxy","config-sentinel",
                                       "qrserver", "storagenode", "searchnode", "distributor",
                                       "transactionlogserver"};
 // TODO        DomContentBuilderTest.assertServices(h, expectedServices);
@@ -201,7 +197,7 @@ public class IndexedTest extends ContentBaseTest {
     }
 
     @Test
-    public void requireCorrectClusterList() throws ParseException, IOException, SAXException
+    public void requireCorrectClusterList()
     {
         VespaModel model = getStreamingVespaModel();
         ContentCluster s = model.getContentClusters().get("test");
@@ -214,7 +210,7 @@ public class IndexedTest extends ContentBaseTest {
     }
 
     @Test
-    public void testContentSummaryStore() throws ParseException, IOException, SAXException {
+    public void testContentSummaryStore() {
         String services= 
                 "<services version='1.0'>" +
                 "<admin version='2.0'><adminserver hostalias='node0' /></admin>" +
@@ -254,7 +250,7 @@ public class IndexedTest extends ContentBaseTest {
     }
 
     @Test
-    public void testMixedIndexAndStoreOnly() throws ParseException, IOException, SAXException {
+    public void testMixedIndexAndStoreOnly() {
         String services=
                 "<services version='1.0'>" +
                 "  <admin version='2.0'><adminserver hostalias='node0' /></admin>" +
@@ -283,7 +279,7 @@ public class IndexedTest extends ContentBaseTest {
     }
 
     @Test
-    public void requireThatIndexingDocprocGetsConfigIdBasedOnDistributionKey() throws ParseException, IOException, SAXException {
+    public void requireThatIndexingDocprocGetsConfigIdBasedOnDistributionKey() {
         VespaModel model = getIndexedVespaModel();
         ContainerCluster cluster = model.getContainerClusters().get("cluster.test.indexing");
         assertEquals("docproc/cluster.test.indexing/3", cluster.getContainers().get(0).getConfigId());
diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp
index 6a82426fe27..97af1a13486 100644
--- a/configutil/src/lib/configstatus.cpp
+++ b/configutil/src/lib/configstatus.cpp
@@ -164,7 +164,6 @@ ConfigStatus::action()
 
                     if (!upToDate) {
                         if (svc.type == "searchnode" ||
-                            svc.type == "filedistributorservice" ||
                             svc.type == "topleveldispatch" ||
                             svc.type == "logd")
                         {
diff --git a/configutil/src/tests/model_inspect/model.cfg b/configutil/src/tests/model_inspect/model.cfg
index 76377e75825..4346ad78104 100644
--- a/configutil/src/tests/model_inspect/model.cfg
+++ b/configutil/src/tests/model_inspect/model.cfg
@@ -147,13 +147,3 @@ 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[14].name "filedistributorservice"
-hosts[0].services[14].type "filedistributorservice"
-hosts[0].services[14].configid "filedistribution/example.yahoo.com"
-hosts[0].services[14].clustertype "filedistribution"
-hosts[0].services[14].clustername "admin"
-hosts[0].services[14].index 999999
-hosts[0].services[14].ports[0].number 19118
-hosts[0].services[14].ports[0].tags "rpc"
-hosts[0].services[14].ports[1].number 19119
-hosts[0].services[14].ports[1].tags "torrent"
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java
index b96364bf95e..81173f9d835 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/SlobrokMonitorManagerImpl.java
@@ -103,7 +103,6 @@ public class SlobrokMonitorManagerImpl implements SuperModelListener, SlobrokApi
             case "config-sentinel":
             case "configproxy":
             case "configserver":
-            case "filedistributorservice":
             case "logd":
             case "logserver":
             case "metricsproxy":