summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-06-15 13:57:28 +0200
committerHarald Musum <musum@yahoo-inc.com>2017-06-15 13:57:28 +0200
commit219a436dc4aa5a2c6c6c2a3189b6107fcaf299c3 (patch)
tree137d738489fa01b318d5d7775b4de8cff03c42d8 /config-model
parentee3cea3a3c64dbe071b87117a18a09237b694642 (diff)
16 distribution bits for all zones in CD
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index c90406f96d7..2a27ccbdd1f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -601,8 +601,7 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
createZone(Environment.prod, "ap-northeast-1"),
createZone(Environment.prod, "ap-northeast-2"),
createZone(Environment.prod, "us-east-3"));
- if ((zone.system() == SystemName.cd && zone.environment() == Environment.prod) || // should reflect how we want it to be in 'main'
- zonesWith16DistributionBits.contains(zone))
+ if (zone.system() == SystemName.cd || zonesWith16DistributionBits.contains(zone))
return 16;
else
return DistributionBitCalculator.getDistributionBits(getNodeCountPerGroup(), getDistributionMode());