diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-06-30 15:12:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 15:12:34 +0200 |
| commit | 111615fe377e72ca5399a6f20244a4d43c3f907e (patch) | |
| tree | a50a1443e5f57745a716a437a44b4160c506ef53 /config-model/src/main/java/com/yahoo | |
| parent | aeed17dd90d0da3935c562d9485deb2a00cd4233 (diff) | |
| parent | 43782c8cdc64bd83f9a7380a484412e0f0833c1c (diff) | |
Merge pull request #23292 from vespa-engine/mpolden/deprecate-combined
Deprecate combined cluster
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 1aab98a115f..5a1103de9a3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -744,9 +744,14 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { private List<ApplicationContainer> createNodes(ApplicationContainerCluster cluster, Element containerElement, Element nodesElement, ConfigModelContext context) { if (nodesElement.hasAttribute("type")) // internal use for hosted system infrastructure nodes return createNodesFromNodeType(cluster, nodesElement, context); - else if (nodesElement.hasAttribute("of")) // hosted node spec referencing a content cluster - return createNodesFromContentServiceReference(cluster, nodesElement, context); - else if (nodesElement.hasAttribute("count")) // regular, hosted node spec + else if (nodesElement.hasAttribute("of")) {// hosted node spec referencing a content cluster + // TODO: Remove support for combined clusters in Vespa 9 + List<ApplicationContainer> containers = createNodesFromContentServiceReference(cluster, nodesElement, context); + log.log(WARNING, "Declaring combined cluster with <nodes of=\"...\"> is deprecated without " + + "replacement, and the feature will be removed in Vespa 9. Use separate container and " + + "content clusters instead"); + return containers; + } else if (nodesElement.hasAttribute("count")) // regular, hosted node spec return createNodesFromNodeCount(cluster, containerElement, nodesElement, context); else if (cluster.isHostedVespa() && cluster.getZone().environment().isManuallyDeployed()) // default to 1 in manual zones return createNodesFromNodeCount(cluster, containerElement, nodesElement, context); |