Merge pull request #5000 from vespa-engine/hmusum/remove-unused-setting

disableFiledistributor is not used anymore

12 files changed, 8 insertions, 37 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index a69835626ea..7b28edbb2fc 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -46,7 +46,7 @@ public interface ModelContext {
         boolean hostedVespa();
         Zone zone();
         Set<Rotation> rotations();
-        default boolean disableFileDistributor() { return false; }
+        default boolean disableFileDistributor() { return true; } // TODO: Remove when oldest version in use is 6.206
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index eb0c6067fca..d6b916680d8 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -68,7 +68,6 @@ public class DeployState implements ConfigDefinitionStore {
     private final Version wantedNodeVespaVersion;
     private final Instant now;
     private final HostProvisioner provisioner;
-    private final boolean disableFiledistributor;
 
     public static DeployState createTestState() {
         return new Builder().build();
@@ -82,7 +81,7 @@ public class DeployState implements ConfigDefinitionStore {
                         FileRegistry fileRegistry, DeployLogger deployLogger, Optional<HostProvisioner> hostProvisioner, DeployProperties properties,
                         Optional<ApplicationPackage> permanentApplicationPackage, Optional<ConfigDefinitionRepo> configDefinitionRepo,
                         java.util.Optional<Model> previousModel, Set<Rotation> rotations, Zone zone, QueryProfiles queryProfiles,
-                        SemanticRules semanticRules, Instant now, Version wantedNodeVespaVersion, boolean disableFiledistributor) {
+                        SemanticRules semanticRules, Instant now, Version wantedNodeVespaVersion) {
         this.logger = deployLogger;
         this.fileRegistry = fileRegistry;
         this.rankProfileRegistry = rankProfileRegistry;
@@ -101,7 +100,6 @@ public class DeployState implements ConfigDefinitionStore {
         this.validationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty);
         this.wantedNodeVespaVersion = wantedNodeVespaVersion;
         this.now = now;
-        this.disableFiledistributor = disableFiledistributor;
     }
 
     public static HostProvisioner getDefaultModelHostProvisioner(ApplicationPackage applicationPackage) {
@@ -215,8 +213,6 @@ public class DeployState implements ConfigDefinitionStore {
 
     public Instant now() { return now; }
 
-    public boolean disableFiledistributor() { return disableFiledistributor; }
-
     public static class Builder {
 
         private ApplicationPackage applicationPackage = MockApplicationPackage.createEmpty();
@@ -231,7 +227,6 @@ public class DeployState implements ConfigDefinitionStore {
         private Zone zone = Zone.defaultZone();
         private Instant now = Instant.now();
         private Version wantedNodeVespaVersion = Vtag.currentVersion;
-        private boolean disableFiledistributor = false;
 
         public Builder applicationPackage(ApplicationPackage applicationPackage) {
             this.applicationPackage = applicationPackage;
@@ -293,11 +288,6 @@ public class DeployState implements ConfigDefinitionStore {
             return this;
         }
 
-        public Builder disableFiledistributor(boolean disableFiledistributor) {
-            this.disableFiledistributor = disableFiledistributor;
-            return this;
-        }
-
         public DeployState build() {
             RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
             QueryProfiles queryProfiles = new QueryProfilesBuilder().build(applicationPackage);
@@ -305,7 +295,7 @@ public class DeployState implements ConfigDefinitionStore {
             SearchDocumentModel searchDocumentModel = createSearchDocumentModel(rankProfileRegistry, logger, queryProfiles);
             return new DeployState(applicationPackage, searchDocumentModel, rankProfileRegistry, fileRegistry, logger, hostProvisioner,
                                    properties, permanentApplicationPackage, configDefinitionRepo, previousModel, rotations,
-                                   zone, queryProfiles, semanticRules, now, wantedNodeVespaVersion, disableFiledistributor);
+                                   zone, queryProfiles, semanticRules, now, wantedNodeVespaVersion);
         }
 
         private SearchDocumentModel createSearchDocumentModel(RankProfileRegistry rankProfileRegistry,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 7a1fab8dbd0..74512e70ebe 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -138,8 +138,7 @@ public class VespaModelFactory implements ModelFactory {
             .rotations(modelContext.properties().rotations())
             .zone(zone)
             .now(clock.instant())
-            .wantedNodeVespaVersion(modelContext.wantedNodeVespaVersion())
-            .disableFiledistributor(modelContext.properties().disableFileDistributor());
+            .wantedNodeVespaVersion(modelContext.wantedNodeVespaVersion());
         modelContext.previousModel().ifPresent(builder::previousModel);
         return builder.build();
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index bce78017bdd..62828b314d0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -144,9 +144,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.loadBalancerAddress().isPresent()) {
             builder.loadBalancerAddress(options.loadBalancerAddress().get());
         }
-        if (options.disableFiledistributor().isPresent()) {
-            builder.disableFiledistributor(options.disableFiledistributor().get());
-        }
     }
 
     private String[] getConfigModelPluginDirs() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index 866bae6666a..0ebd3987ba4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -44,5 +44,4 @@ public interface CloudConfigOptions {
     Optional<String> dockerRegistry();
     Optional<String> dockerVespaBaseImage();
     Optional<String> loadBalancerAddress();
-    Optional<Boolean> disableFiledistributor();
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index 01e1a0ba9fa..ad35eff6467 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -306,7 +306,6 @@ public class AdminTestCase {
     @Test
     public void testDisableFileDistributorForAllApps() {
         DeployState state = new DeployState.Builder()
-                .disableFiledistributor(true)
                 .properties(
                         new DeployProperties.Builder().
                                 zone(new Zone(Environment.dev, RegionName.from("baz"))).
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
index 1784fe0e974..c698e9f5079 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
@@ -19,7 +19,6 @@ public class TestOptions implements CloudConfigOptions {
     private Optional<Boolean> useVespaVersionInRequest = Optional.empty();
     private Optional<Boolean> hostedVespa = Optional.empty();
     private Optional<Integer> numParallelTenantLoaders = Optional.empty();
-    private Optional<Boolean> disableFiledistributor = Optional.empty();
 
     @Override
     public Optional<Integer> rpcPort() {
@@ -118,9 +117,6 @@ public class TestOptions implements CloudConfigOptions {
     @Override
     public Optional<String> loadBalancerAddress() { return Optional.empty(); }
 
-    @Override
-    public Optional<Boolean> disableFiledistributor() { return disableFiledistributor; }
-
     public TestOptions numParallelTenantLoaders(int numLoaders) {
         this.numParallelTenantLoaders = Optional.of(numLoaders);
         return this;
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 4502cc7e223..2f05c1a2259 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
@@ -141,7 +141,6 @@ 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,
@@ -149,8 +148,7 @@ public class ModelContextImpl implements ModelContext {
                           HostName loadBalancerName,
                           boolean hostedVespa,
                           Zone zone,
-                          Set<Rotation> rotations,
-                          boolean disableFileDistributor) {
+                          Set<Rotation> rotations) {
             this.applicationId = applicationId;
             this.multitenant = multitenant;
             this.configServerSpecs = configServerSpecs;
@@ -158,7 +156,6 @@ public class ModelContextImpl implements ModelContext {
             this.hostedVespa = hostedVespa;
             this.zone = zone;
             this.rotations = rotations;
-            this.disableFileDistributor = disableFileDistributor;
         }
 
         @Override
@@ -194,8 +191,6 @@ public class ModelContextImpl implements ModelContext {
         @Override
         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 731e343532a..daff32198a3 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
@@ -186,8 +186,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                                HostName.from(configserverConfig.loadBalancerAddress()),
                                                configserverConfig.hostedVespa(),
                                                zone,
-                                               rotations,
-                                               configserverConfig.disableFiledistributor());
+                                               rotations);
     }
 
     /** 
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 5c19aae9a7e..bfed526a130 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
@@ -154,8 +154,7 @@ public class SessionPreparer {
                                                               HostName.from(configserverConfig.loadBalancerAddress()),
                                                               configserverConfig.hostedVespa(),
                                                               zone,
-                                                              rotationsSet,
-                                                              configserverConfig.disableFiledistributor());
+                                                              rotationsSet);
             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 e4c336a55f1..aed0a6a9750 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,8 +48,7 @@ public class ModelContextImplTest {
                         null,
                         false,
                         Zone.defaultZone(),
-                        rotations,
-                        false),
+                        rotations),
                 Optional.empty(),
                 new Version(6), 
                 new Version(6));
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala
index 41e6b66b986..436c1923319 100644
--- a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala
+++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala
@@ -39,7 +39,6 @@ class CloudConfigYinstVariables extends CloudConfigOptions {
   override val dockerRegistry = optionalYinstVar[java.lang.String]("docker_registry")
   override val dockerVespaBaseImage = optionalYinstVar[java.lang.String]("docker_vespa_base_image")
   override val loadBalancerAddress = optionalYinstVar[java.lang.String]("load_balancer_address")
-  override val disableFiledistributor = optionalYinstVar[java.lang.Boolean]("disable_filedistributor")
 }
 
 object CloudConfigYinstVariables {