diff options
| -rw-r--r-- | configdefinitions/src/vespa/configserver.def | 3 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index f8f4d6b0d92..d489bf2012e 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -61,9 +61,6 @@ maxDurationOfBootstrap long default=7200 # Code uses backoff, so wait time will increase for every iteration sleepTimeWhenRedeployingFails long default=15 -# Features (to be overridden in configserver-config.xml if needed) -buildMinimalSetOfConfigModels bool default=true - # Unused, remove in Vespa 8 throwIfActiveSessionCannotBeLoaded bool default=true 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 707a828bdd6..2d4aa78bcf6 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 @@ -1,7 +1,6 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.modelfactory; -import com.google.common.util.concurrent.UncheckedTimeoutException; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.Version; import com.yahoo.config.application.api.ApplicationPackage; @@ -32,7 +31,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.NoSuchElementException; import java.util.Optional; import java.util.Set; import java.util.logging.Level; @@ -224,8 +222,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { } private Set<Version> versionsToBuild(Set<Version> versions, Version wantedVersion, int majorVersion, AllocatedHosts allocatedHosts) { - if (configserverConfig.buildMinimalSetOfConfigModels()) - versions = keepThoseUsedOn(allocatedHosts, versions); + versions = keepThoseUsedOn(allocatedHosts, versions); // Make sure we build wanted version if we are building models for this major version and we are on hosted vespa // If not on hosted vespa, we do not want to try to build this version, since we have only one version (the latest) |