aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-08-03 22:36:01 +0200
committerGitHub <noreply@github.com>2019-08-03 22:36:01 +0200
commit7843f858c90dd58a996860e4e3910cc5a66e0f63 (patch)
treee965c51f1ccae11c8f41f29dd25435e0c8f37990
parentb4c3fbf2aafa837bd7768b1de23d1b7e24f442fa (diff)
parentc6e452c659790f17dab9defc184dc1e38fc7d43a (diff)
Merge pull request #10187 from vespa-engine/balder/only-use-toplevel-groups-for-redundancy
Only use toplevel groups for redundancy calculations.
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
index 3b6ba6a6b85..bf579744efb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
@@ -43,7 +43,7 @@ public class RedundancyBuilder {
subGroups = Math.max(1, subGroups);
IndexedHierarchicDistributionValidator.validateThatLeafGroupsCountIsAFactorOfRedundancy(clusterName, finalRedundancy, subGroups);
IndexedHierarchicDistributionValidator.validateThatReadyCopiesIsCompatibleWithRedundancy(clusterName, finalRedundancy, readyCopies, subGroups);
- return new Redundancy(initialRedundancy/leafGroups, finalRedundancy/leafGroups, readyCopies/leafGroups, leafGroups, totalNodes);
+ return new Redundancy(initialRedundancy/subGroups, finalRedundancy/subGroups, readyCopies/subGroups, subGroups, totalNodes);
}
}