diff options
author | Harald Musum <musum@oath.com> | 2018-02-10 07:21:40 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-02-10 07:21:40 +0100 |
commit | 2bc5541ab8e40aafaf2335cb57d04c4395552fa4 (patch) | |
tree | 35f3a3465006638cb51d7594f7bf2a81448b389c /configserver | |
parent | ead0a8b621cc85b67f454f2fbc089dcb5cf48fee (diff) |
disableFiledistributor is not used anymore
Diffstat (limited to 'configserver')
3 files changed, 3 insertions, 10 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 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, |