diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-05-23 16:40:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-23 16:40:12 +0200 |
commit | 692121a90e14acc7ddb65dbc0ff7a2922ddd6713 (patch) | |
tree | daf19f930074dc083f1f7903acb4c864e2252c30 /config-model/src/main/java | |
parent | 892d4c41216a44ed704855239336316fe8f35293 (diff) | |
parent | c5371bd9d2939bbfb2059c349eb671175b4ba03c (diff) |
Merge pull request #22713 from vespa-engine/jonmv/logserver-for-tester
Jonmv/logserver for tester
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java | 8 |
1 files changed, 4 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 a91a7949ad8..9072b5d9cfe 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 @@ -73,7 +73,6 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { private void assignLogserver(DeployState deployState, NodesSpecification nodesSpecification, Admin admin) { if (nodesSpecification.minResources().nodes() > 1) throw new IllegalArgumentException("You can only request a single log server"); - if (deployState.getProperties().applicationId().instance().isTester()) return; // No logserver is needed on tester applications if (nodesSpecification.isDedicated()) { Collection<HostResource> hosts = allocateHosts(admin.hostSystem(), "logserver", nodesSpecification); if (hosts.isEmpty()) return; // No log server can be created (and none is needed) @@ -92,9 +91,10 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { private NodesSpecification createNodesSpecificationForLogserver() { DeployState deployState = context.getDeployState(); - if (deployState.getProperties().useDedicatedNodeForLogserver() && - context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && - deployState.isHosted()) + if ( deployState.getProperties().useDedicatedNodeForLogserver() + && context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT + && deployState.isHosted() + && ! deployState.getProperties().applicationId().instance().isTester()) return NodesSpecification.dedicated(1, context); else return NodesSpecification.nonDedicated(1, context); |