diff options
author | Harald Musum <musum@oath.com> | 2018-09-25 13:48:14 +0200 |
---|---|---|
committer | olaaun <ola.aunroe@gmail.com> | 2018-09-25 13:48:14 +0200 |
commit | a221f0f8300e9ec6ac09dea8fc9282674641f0ed (patch) | |
tree | 7f7d14a48c2cbb9dd12dec21165753c186e29c88 /config-model | |
parent | 5cddfbae790d23b5a98506a31bd43f197658486b (diff) |
Set useDedicatedNodeForLogserver to true, but enable only for dev in CD (#7083)
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java | 4 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java | 3 |
2 files changed, 4 insertions, 3 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 5cf55be5534..65008b503b4 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 @@ -6,6 +6,7 @@ import com.yahoo.config.model.api.ConfigServerSpec; 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.log.LogLevel; import com.yahoo.vespa.model.HostResource; @@ -98,7 +99,8 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { if (deployState.getProperties().useDedicatedNodeForLogserver() && context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && deployState.isHosted() && - deployState.zone().system() == SystemName.cd) + deployState.zone().system() == SystemName.cd && + deployState.zone().environment() == Environment.dev) return NodesSpecification.dedicated(1, context); else return NodesSpecification.nonDedicated(1, context); diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index 32a881633b8..786abc3f85a 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -48,7 +48,6 @@ import java.util.stream.Collectors; import static com.yahoo.config.model.test.TestUtil.joinLines; import static com.yahoo.vespa.defaults.Defaults.getDefaults; -import static org.hamcrest.CoreMatchers.both; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.collection.IsIn.isIn; import static org.hamcrest.core.Every.everyItem; @@ -1758,7 +1757,7 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.useDedicatedNodeForLogserver(useDedicatedNodeForLogserver); tester.addHosts(numberOfHosts); - Zone zone = new Zone(SystemName.cd, Environment.prod, RegionName.defaultName()); + Zone zone = new Zone(SystemName.cd, Environment.dev, RegionName.defaultName()); VespaModel model = tester.createModel(zone, services, true); assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts)); |