diff options
author | Ola Aunrønning <ola.aunroe@gmail.com> | 2019-01-10 22:05:05 +0100 |
---|---|---|
committer | Ola Aunrønning <ola.aunroe@gmail.com> | 2019-01-10 22:05:05 +0100 |
commit | ca4415af8c45edc3eab2344b5a8f9cf2089d00c5 (patch) | |
tree | 033f1fda94b81457c2a4b857a74eca3b1a1ea7c2 | |
parent | 9e8d4d88d9d5def49858ba1c32ed591e340b22c6 (diff) |
Revert "Added logserver feature flag (#8065)"
This reverts commit 7a8c964cbc167b617a6c5feb8c62b7585d7e542a.
6 files changed, 7 insertions, 50 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index 4a99593d505..57dbadd94ab 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -298,11 +298,6 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>flags</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> 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 056872f9980..c0d97e43adb 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 @@ -29,7 +29,6 @@ import com.yahoo.vespa.config.ConfigDefinitionBuilder; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.documentmodel.DocumentModel; import com.yahoo.config.application.api.ValidationOverrides; -import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.model.container.search.QueryProfiles; import com.yahoo.vespa.model.container.search.QueryProfilesBuilder; import com.yahoo.vespa.model.container.search.SemanticRuleBuilder; @@ -74,7 +73,6 @@ public class DeployState implements ConfigDefinitionStore { private final Version wantedNodeVespaVersion; private final Instant now; private final HostProvisioner provisioner; - private final FlagSource flagSource; public static DeployState createTestState() { return new Builder().build(); @@ -100,8 +98,7 @@ public class DeployState implements ConfigDefinitionStore { QueryProfiles queryProfiles, SemanticRules semanticRules, Instant now, - Version wantedNodeVespaVersion, - FlagSource flagSource) { + Version wantedNodeVespaVersion) { this.logger = deployLogger; this.fileRegistry = fileRegistry; this.rankProfileRegistry = rankProfileRegistry; @@ -123,7 +120,6 @@ public class DeployState implements ConfigDefinitionStore { this.validationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty); this.wantedNodeVespaVersion = wantedNodeVespaVersion; this.now = now; - this.flagSource = flagSource; } public static HostProvisioner getDefaultModelHostProvisioner(ApplicationPackage applicationPackage) { @@ -240,8 +236,6 @@ public class DeployState implements ConfigDefinitionStore { public Instant now() { return now; } - public FlagSource flagSource() { return flagSource; } - public static class Builder { private ApplicationPackage applicationPackage = MockApplicationPackage.createEmpty(); @@ -257,7 +251,6 @@ public class DeployState implements ConfigDefinitionStore { private Zone zone = Zone.defaultZone(); private Instant now = Instant.now(); private Version wantedNodeVespaVersion = Vtag.currentVersion; - private FlagSource flagSource; public Builder applicationPackage(ApplicationPackage applicationPackage) { this.applicationPackage = applicationPackage; @@ -319,11 +312,6 @@ public class DeployState implements ConfigDefinitionStore { return this; } - public Builder flagSource(FlagSource flagSource) { - this.flagSource = flagSource; - return this; - } - public Builder wantedNodeVespaVersion(Version version) { this.wantedNodeVespaVersion = version; return this; @@ -354,8 +342,7 @@ public class DeployState implements ConfigDefinitionStore { queryProfiles, semanticRules, now, - wantedNodeVespaVersion, - flagSource); + 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 e7bc2daf736..d3f4a122b1e 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 @@ -23,7 +23,6 @@ import com.yahoo.config.model.deploy.DeployState; import com.yahoo.component.Version; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.config.VespaVersion; -import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.model.application.validation.Validation; import org.xml.sax.SAXException; @@ -34,7 +33,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.logging.Logger; /** @@ -50,13 +48,12 @@ public class VespaModelFactory implements ModelFactory { private final Zone zone; private final Clock clock; private final Version version; - private final FlagSource flagSource; /** Creates a factory for vespa models for this version of the source */ @Inject public VespaModelFactory(ComponentRegistry<ConfigModelPlugin> pluginRegistry, ComponentRegistry<MlModelImporter> modelImporters, - Zone zone, FlagSource flagSource) { + Zone zone) { this.version = new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro); List<ConfigModelBuilder> modelBuilders = new ArrayList<>(); for (ConfigModelPlugin plugin : pluginRegistry.allComponents()) { @@ -68,7 +65,6 @@ public class VespaModelFactory implements ModelFactory { this.modelImporters = modelImporters.allComponents(); this.zone = zone; this.clock = Clock.systemUTC(); - this.flagSource = flagSource; } public VespaModelFactory(ConfigModelRegistry configModelRegistry) { @@ -88,7 +84,6 @@ public class VespaModelFactory implements ModelFactory { this.modelImporters = Collections.emptyList(); this.zone = Zone.defaultZone(); this.clock = clock; - this.flagSource = (id, vector) -> Optional.empty(); } /** Returns the version this model is build for */ @@ -148,7 +143,6 @@ public class VespaModelFactory implements ModelFactory { .modelImporters(modelImporters) .zone(zone) .now(clock.instant()) - .flagSource(flagSource) .wantedNodeVespaVersion(modelContext.wantedNodeVespaVersion()); modelContext.previousModel().ifPresent(builder::previousModel); return builder.build(validationParameters); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java index 28cea9843c7..2c23043abea 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java @@ -10,9 +10,6 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.SystemName; import com.yahoo.log.LogLevel; -import com.yahoo.vespa.flags.FetchVector; -import com.yahoo.vespa.flags.FlagSource; -import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.model.HostResource; import com.yahoo.vespa.model.HostSystem; import com.yahoo.vespa.model.admin.Admin; @@ -103,7 +100,8 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { if (deployState.getProperties().useDedicatedNodeForLogserver() && context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && deployState.isHosted() && - logServerFlagValue(deployState)) + deployState.zone().system() == SystemName.cd && + deployState.zone().environment() == Environment.dev) return NodesSpecification.dedicated(1, context); else return NodesSpecification.nonDedicated(1, context); @@ -225,10 +223,4 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { admin.addSlobroks(slobroks); } - private boolean logServerFlagValue(DeployState deployState) { - return Flags.ENABLE_LOGSERVER.bindTo(deployState.flagSource()) - .with(FetchVector.Dimension.APPLICATION_ID, deployState.getProperties().applicationId().serializedForm()) - .value(); - } - } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java index d3696c6e52f..060fe96100d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java @@ -16,10 +16,6 @@ import com.yahoo.config.model.provision.SingleNodeProvisioner; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.flags.FetchVector; -import com.yahoo.vespa.flags.FlagId; -import com.yahoo.vespa.flags.FlagSource; -import com.yahoo.vespa.flags.JsonNodeRawFlag; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; @@ -144,13 +140,11 @@ public class VespaModelTester { .useDedicatedNodeForLogserver(useDedicatedNodeForLogserver) .build(); - FlagSource flagSource = (FlagId id, FetchVector vector) -> Optional.of(JsonNodeRawFlag.fromJson(String.valueOf(useDedicatedNodeForLogserver))); DeployState deployState = new DeployState.Builder() .applicationPackage(appPkg) .modelHostProvisioner(provisioner) .properties(properties) .zone(zone) - .flagSource(flagSource) .build(); return modelCreatorWithMockPkg.create(false, deployState, configModelRegistry); } diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index c94625cd7c4..923c37a90e5 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Optional; import java.util.TreeMap; -import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID; import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME; /** @@ -75,12 +74,8 @@ public class Flags { public static final UnboundBooleanFlag ENABLE_CPU_TEMPERATURE_TASK = defineFeatureFlag( "enable-cputemptask", true, "Whether to enable CPU temperature task", "Takes effect on next host admin tick", - HOSTNAME); - - public static final UnboundBooleanFlag ENABLE_LOGSERVER = defineFeatureFlag( - "enable-logserver", false, - "Whether to enable logserver.", "Takes effect at redeployment", - APPLICATION_ID); + HOSTNAME + ); /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, |