diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-03-26 10:23:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 10:23:23 +0100 |
| commit | c45080cd7bf1695be0d61d0f81e2fd4ad13204df (patch) | |
| tree | 0843262be89f6a970e4b65b823d17ca845b50eef /config-model | |
| parent | 4ec2ee8cce4c380abd6ee79ecfcc93201ae9e751 (diff) | |
| parent | 41f97b5e00b18cd1cc268c67fca6bca6110be1f5 (diff) | |
Merge pull request #8899 from vespa-engine/olaa/logserver-check-version
Check Vespa version when assigning logserver
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java | 1 |
1 files changed, 1 insertions, 0 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 7d8c219d5ef..6b697a0f329 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 @@ -76,6 +76,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { private void assignLogserver(DeployState deployState, NodesSpecification nodesSpecification, Admin admin) { if (nodesSpecification.count() > 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 (deployState.getVespaVersion().getMajor() == 6) return; // Logserver is not supported on Vespa 6 if (nodesSpecification.isDedicated()) { Collection<HostResource> hosts = allocateHosts(admin.getHostSystem(), "logserver", nodesSpecification); if (hosts.isEmpty()) return; // No log server can be created (and none is needed) |