diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-02 23:46:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 23:46:09 +0200 |
| commit | d037a6230c6b57e893db6ab08a5aa69f22d25579 (patch) | |
| tree | b29f21b900f44f29caffcf0dc62feacd8cf147a7 /config-model/src/test/java/com/yahoo | |
| parent | a592b00a7f78dcbd85ae709339138304e30b78aa (diff) | |
Revert "Revert "As redundancy and searchable copies depends on group setup normally,""
Diffstat (limited to 'config-model/src/test/java/com/yahoo')
5 files changed, 9 insertions, 4 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java index 8ae68468374..f36ef6c3ba3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java @@ -113,6 +113,7 @@ public class DistributorTest { assertEquals(true, conf.inlinebucketsplitting()); cluster = parseCluster("<cluster id=\"storage\">\n" + + " <redundancy>2</redundancy>" + " <documents/>" + " <tuning>" + " <distribution type=\"legacy\"/>" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java index 3b2a741a177..eef48120da8 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/RedundancyTest.java @@ -22,9 +22,7 @@ public class RedundancyTest { } private static Redundancy createRedundancy(int redundancy, int implicitGroups, int totalNodes) { - Redundancy r = new Redundancy(1, redundancy, 1); - r.setImplicitGroups(implicitGroups); - r.setTotalNodes(totalNodes); + Redundancy r = new Redundancy(1, redundancy, 1, implicitGroups, totalNodes); return r; } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java index bbb101dbb08..21c384dfc69 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java @@ -305,7 +305,8 @@ public class StorageClusterTest { public void requireThatGroupNamesMustBeUniqueAmongstSiblings() { String xml = "<cluster id=\"storage\">\n" + - "<documents/>\n" + + " <redundancy>2</redundancy>" + + " <documents/>\n" + " <group>\n" + " <distribution partitions=\"*\"/>\n" + " <group distribution-key=\"0\" name=\"bar\">\n" + @@ -330,6 +331,7 @@ public class StorageClusterTest { public void requireThatGroupNamesCanBeDuplicatedAcrossLevels() { String xml = "<cluster id=\"storage\">\n" + + " <redundancy>2</redundancy>" + "<documents/>\n" + " <group>\n" + " <distribution partitions=\"*\"/>\n" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java index c1789a05f3c..cb457cabf6c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java @@ -80,6 +80,7 @@ public class StorageGroupTest { StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder(); parse( "<content version=\"1.0\" id=\"storage\">\n" + + " <redundancy>4</redundancy>" + " <documents/>" + " <group>\n" + " <distribution partitions=\"1|*\"/>\n" + @@ -134,6 +135,7 @@ public class StorageGroupTest { StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder(); parse( "<content version=\"1.0\" id=\"storage\">\n" + + " <redundancy>2</redundancy>" + " <documents/>" + " <group>\n" + " <distribution partitions=\"1|*\"/>\n" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java index e4decbc9a10..4fadea74feb 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java @@ -124,6 +124,8 @@ public class ClusterTest { " </engine>", " <group>", " <node hostalias='my_host' distribution-key='0' />", + " <node hostalias='my_host' distribution-key='1' />", + " <node hostalias='my_host' distribution-key='2' />", " </group>", contentSearchXml, " </content>", |