diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-06-01 13:34:59 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:24 +0200 |
| commit | daa980fcd31971bc9418fe8717f835e53d501969 (patch) | |
| tree | 1892f44a2567a5c4016a792920d11ee3d5bb8bec /config-model/src/main/java/com | |
| parent | 4362305cc4ac7c25dc4c2def8bacb0ecb15c5252 (diff) | |
Remove on Vespa 8
Diffstat (limited to 'config-model/src/main/java/com')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java | 2 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java index b41d805f2a7..975abad9960 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java @@ -242,7 +242,7 @@ public class StorageGroup { int minNodesPerGroup = (int)Math.ceil((double)nodesSpec.minResources().nodes() / nodesSpec.minResources().groups()); - if (minNodesPerGroup < redundancy) { // TODO: Fail on this on Vespa 8, and simplify + if (minNodesPerGroup < redundancy) { // TODO: Fail on this on Vespa 8, and simplify? But see ModelProvisioningTest.testThatStandaloneSyntaxWorksOnHostedManuallyDeployed context.getDeployLogger() .logApplicationPackage(Level.WARNING, "Cluster '" + clusterElement.stringAttribute("id") + "' " + diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java index d7cafafb87f..aebdfdf61cf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java @@ -27,12 +27,6 @@ public class DomTuningDispatchBuilder { builder.setDispatchPolicy(dispatchElement.childAsString("dispatch-policy")); builder.setMinActiveDocsCoverage(dispatchElement.childAsDouble("min-active-docs-coverage")); - if (dispatchElement.child("min-group-coverage") != null) // TODO: Remove on Vespa 8 - logger.logApplicationPackage(Level.WARNING, "Attribute 'min-group-coverage' is deprecated and ignored: " + - "Use min-active-docs-coverage instead."); - if (dispatchElement.child("use-local-node") != null) // TODO: Remove on Vespa 8 - logger.logApplicationPackage(Level.WARNING, "Attribute 'use-local-node' is deprecated and ignored: " + - "The local node will automatically be preferred when appropriate."); return builder.build(); } |