diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-23 12:17:34 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-23 12:17:34 +0100 |
| commit | 49512deb96d4daa6d0be7ad652d3436a4985887c (patch) | |
| tree | 0264437edb5625984adc783e8067e45972451a9a | |
| parent | 0d1baa5e33382bc9703be676572283ac92dafcea (diff) | |
Restore turning use dedicated node off
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 0700d7280f7..4b9fd7db27e 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -56,7 +56,7 @@ public interface ModelContext { boolean isBootstrap(); boolean isFirstTimeDeployment(); - // TODO: Remove after April 2020 + // TODO: Only needed for LbServicesProducerTest default boolean useDedicatedNodeForLogserver() { return true; } boolean useAdaptiveDispatch(); 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 e3357976a2b..5629956e8b9 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 @@ -90,7 +90,9 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { private NodesSpecification createNodesSpecificationForLogserver() { DeployState deployState = context.getDeployState(); - if (context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && deployState.isHosted()) + if (deployState.getProperties().useDedicatedNodeForLogserver() && + context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && + deployState.isHosted()) return NodesSpecification.dedicated(1, context); else return NodesSpecification.nonDedicated(1, context); |