Remove call to reload file distributor

4 files changed, 2 insertions, 15 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 47a644a39d4..a4130c8052c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -412,11 +412,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     }
 
     @Override
-    public void reloadDeployFileDistributor(FileDistribution fileDistribution) {
-        getFileDistributor().reloadDeployFileDistributor(fileDistribution);
-    }
-
-    @Override
     public AllocatedHosts allocatedHosts() {
         return allocatedHosts;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
index ffba56fa17f..34e242400d3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
@@ -24,9 +24,7 @@ public class FileDistributionConfigProvider {
     }
 
     public void getConfig(FiledistributorrpcConfig.Builder builder) {
-        // If disabled config proxy should act as file distributor, so use config proxy port
-        int port = ConfigProxy.BASEPORT;
-        builder.connectionspec("tcp/" + host.getHostname() + ":" + port);
+        builder.connectionspec("tcp/" + host.getHostname() + ":" + ConfigProxy.BASEPORT);
     }
 
     public void getConfig(FilereferencesConfig.Builder builder) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
index ad27d86fb84..abd4b604a6d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
@@ -133,10 +133,4 @@ public class FileDistributor {
         dbHandler.removeDeploymentsThatHaveDifferentApplicationId(getTargetHostnames());
     }
 
-    // should only be called during deploy, and only once, since it leads to file distributor
-    // rescanning all files, which is very expensive ATM (April 2016)
-    public void reloadDeployFileDistributor(FileDistribution dbHandler) {
-        dbHandler.reloadDeployFileDistributor();
-    }
-
 }
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 d3879f1ab36..96137652e22 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(admin.getConfigservers().size(), is(1));
         Set<HostInfo> hosts = model.getHosts();
         assertThat(hosts.size(), is(1));
-        //logd, config proxy, sentinel, config server, slobrok, log server, file distributor
+        //logd, config proxy, sentinel, config server, slobrok, log server
         HostInfo host = hosts.iterator().next();
         assertThat(host.getServices().size(), is(6));
         new LogdConfig((LogdConfig.Builder) model.getConfig(new LogdConfig.Builder(), "admin/model"));