Merge pull request #4286 from vespa-engine/hmusum/more-wiring-for-disabling-filedistributor

More wiring for making it possible to disable filedistributor

4 files changed, 16 insertions, 9 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index c0c9c309576..4502cc7e223 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -130,8 +130,8 @@ public class ModelContextImpl implements ModelContext {
     public Version wantedNodeVespaVersion() { return wantedNodeVespaVersion; }
 
     /**
-    * @author lulf
-    */
+     * @author Ulf Lilleengen
+     */
     public static class Properties implements ModelContext.Properties {
 
         private final ApplicationId applicationId;
@@ -141,6 +141,7 @@ public class ModelContextImpl implements ModelContext {
         private final boolean hostedVespa;
         private final Zone zone;
         private final Set<Rotation> rotations;
+        private final boolean disableFileDistributor;
 
         public Properties(ApplicationId applicationId,
                           boolean multitenant,
@@ -148,7 +149,8 @@ public class ModelContextImpl implements ModelContext {
                           HostName loadBalancerName,
                           boolean hostedVespa,
                           Zone zone,
-                          Set<Rotation> rotations) {
+                          Set<Rotation> rotations,
+                          boolean disableFileDistributor) {
             this.applicationId = applicationId;
             this.multitenant = multitenant;
             this.configServerSpecs = configServerSpecs;
@@ -156,6 +158,7 @@ public class ModelContextImpl implements ModelContext {
             this.hostedVespa = hostedVespa;
             this.zone = zone;
             this.rotations = rotations;
+            this.disableFileDistributor = disableFileDistributor;
         }
 
         @Override
@@ -189,9 +192,10 @@ public class ModelContextImpl implements ModelContext {
         }
 
         @Override
-        public Set<Rotation> rotations() {
-            return rotations;
-        }
+        public Set<Rotation> rotations() { return rotations; }
+
+        @Override
+        public boolean disableFileDistributor() { return disableFileDistributor; }
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 48732814919..ea8405f6b65 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -185,7 +185,8 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                                HostName.from(configserverConfig.loadBalancerAddress()),
                                                configserverConfig.hostedVespa(),
                                                zone,
-                                               rotations);
+                                               rotations,
+                                               configserverConfig.disableFiledistributor());
     }
 
     /** 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 531085883c4..70db406bd53 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -155,7 +155,8 @@ public class SessionPreparer {
                                                               HostName.from(configserverConfig.loadBalancerAddress()),
                                                               configserverConfig.hostedVespa(),
                                                               zone,
-                                                              rotationsSet);
+                                                              rotationsSet,
+                                                              configserverConfig.disableFiledistributor());
             this.preparedModelsBuilder = new PreparedModelsBuilder(modelFactoryRegistry,
                                                                    permanentApplicationPackage,
                                                                    configDefinitionRepo,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
index aed0a6a9750..e4c336a55f1 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
@@ -48,7 +48,8 @@ public class ModelContextImplTest {
                         null,
                         false,
                         Zone.defaultZone(),
-                        rotations),
+                        rotations,
+                        false),
                 Optional.empty(),
                 new Version(6), 
                 new Version(6));