implement FiledistributorrpcConfig.Producer in SearchNode

4 files changed, 22 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index f1d274bc80c..4636d1d5ae5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -341,9 +341,9 @@ public class Container extends AbstractService implements
         Filedistributor.Builder builder = new Filedistributor.Builder();
 
         FileDistributionConfigProducer fileDistribution = getRoot().getFileDistributionConfigProducer();
-        if (fileDistribution != null)
-            builder.configid(fileDistribution.getFileDistributionServiceConfigId(getHost()));
-
+        if (fileDistribution != null) {
+            builder.configid(fileDistribution.getFileDistributorService(getHost()).getConfigId());
+        }
         return builder;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
index c3fcdddb273..630118cc60c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
@@ -23,12 +23,12 @@ public class FileDistributionConfigProducer extends AbstractConfigProducer {
         this.options = options;
     }
 
-    public String getFileDistributionServiceConfigId(Host host) {
+    public FileDistributorService getFileDistributorService(Host host) {
         FileDistributorService service = fileDistributorServices.get(host);
         if (service == null) {
             throw new IllegalStateException("No file distribution service for host " + host);
         }
-        return service.getConfigId();
+        return service;
     }
 
     public FileDistributor getFileDistributor() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
index c88b40c8c3d..4d7b943d5b3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
@@ -42,7 +42,7 @@ public abstract class SearchCluster extends AbstractSearchCluster
         super.writeFiles(directory);
     }
 
-	/**
+   /**
      * Must be called after cluster is built, to derive SD configs
      * Derives the search definitions from the application package..
      * Also stores the document names contained in the search
@@ -73,7 +73,7 @@ public abstract class SearchCluster extends AbstractSearchCluster
     }
 
     /**
-     * Converst summary and summary map config to the appropriate information in documentdb
+     * Converts summary and summary map config to the appropriate information in documentdb
      *
      * @param summaryConfigProducer the summary config
      * @param summarymapConfigProducer the summary map config, or null if none is available
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 1faf9f82e04..19698373c70 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.search;
 
+import com.yahoo.cloud.config.filedistribution.FiledistributorrpcConfig;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.metrics.MetricsmanagerConfig;
 import com.yahoo.searchlib.TranslogserverConfig;
@@ -18,6 +19,8 @@ import com.yahoo.vespa.model.admin.MonitoringSystem;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
 import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder;
 import com.yahoo.vespa.model.content.ContentNode;
+import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
+import com.yahoo.vespa.model.filedistribution.FileDistributorService;
 import org.w3c.dom.Element;
 
 import java.util.HashMap;
@@ -41,6 +44,7 @@ import java.util.Optional;
 public class SearchNode extends AbstractService implements
         SearchInterface,
         ProtonConfig.Producer,
+        FiledistributorrpcConfig.Producer,
         MetricsmanagerConfig.Producer,
         TranslogserverConfig.Producer {
 
@@ -235,6 +239,17 @@ public class SearchNode extends AbstractService implements
     }
 
     @Override
+    public void getConfig(FiledistributorrpcConfig.Builder builder) {
+        FileDistributionConfigProducer fileDistribution = getRoot().getFileDistributionConfigProducer();
+        if (fileDistribution != null) {
+            FileDistributorService fds = fileDistribution.getFileDistributorService(getHost());
+            if (fds != null) {
+                fds.getConfig(builder);
+            }
+        }
+    }
+
+    @Override
     public void getConfig(ProtonConfig.Builder builder) {
         builder.
             ptport(getDispatchPort()).