diff options
author | Harald Musum <musum@oath.com> | 2018-10-03 11:27:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-03 11:27:27 +0200 |
commit | 905ef15648e353c420006ddaf65b1d8456da8217 (patch) | |
tree | 0897eb6e8848438bf46cca676e27714c39d5b36e /config-model | |
parent | 172c40ba07b4a2ae7e200edad5c3044f98086e1c (diff) |
Revert "Revert "Enable dedicated log server nodes in all dev and perf zones and one p…""
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java | 9 |
1 files changed, 5 insertions, 4 deletions
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 16dd1970ed1..26de67d4722 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 @@ -7,7 +7,7 @@ import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.SystemName; +import com.yahoo.config.provision.RegionName; import com.yahoo.log.LogLevel; import com.yahoo.vespa.model.HostResource; import com.yahoo.vespa.model.HostSystem; @@ -21,6 +21,7 @@ import com.yahoo.vespa.model.container.component.Handler; import org.w3c.dom.Element; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Objects; @@ -94,13 +95,13 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { } private NodesSpecification createNodesSpecificationForLogserver() { - // TODO: Enable for main system as well + // TODO: Enable for all zones DeployState deployState = context.getDeployState(); if (deployState.getProperties().useDedicatedNodeForLogserver() && context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && deployState.isHosted() && - deployState.zone().system() == SystemName.cd && - deployState.zone().environment() == Environment.dev) + (Arrays.asList(Environment.dev, Environment.perf).contains(deployState.zone().environment()) || + deployState.zone().region().equals(RegionName.from("eu-west-1")))) return NodesSpecification.dedicated(1, context); else return NodesSpecification.nonDedicated(1, context); |