diff options
author | Harald Musum <musum@oath.com> | 2018-10-01 13:30:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-01 13:30:16 +0200 |
commit | 73f9e38d4f076a569d3a0176351be3135bc1f5de (patch) | |
tree | 66958584e26f225467fc2806026b7ca7007ae709 | |
parent | 1cb9459c3540aed9431b4824f19766555d00d1c3 (diff) | |
parent | 05620f58d4ad581a769f56d64995f0117026b5ec (diff) |
Merge pull request #7154 from vespa-engine/hmusum/use-dedicated-logserver-nodes-in-more-zones
Enable dedicated log server nodes in all dev and perf zones and one p…
-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 65008b503b4..92a64d6cb97 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); |