diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2017-06-15 14:00:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 14:00:40 +0200 |
| commit | 29402a58b7da70363549f4f8b9a3a1e571bb808a (patch) | |
| tree | 2cb40a78612ddb62e6659e5eb3643ad76676257c /config-model | |
| parent | 9aab5c53f1904138ccf743bb993e8aaaa76728c9 (diff) | |
| parent | 219a436dc4aa5a2c6c6c2a3189b6107fcaf299c3 (diff) | |
Merge pull request #2793 from yahoo/hmusum/use-16-distribution-bits-in-cd-prod
Use 16 distribution bits in prod zones in CD
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 3 |
1 files changed, 2 insertions, 1 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 46e0500971a..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 @@ -8,6 +8,7 @@ import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.config.content.MessagetyperouteselectorpolicyConfig; import com.yahoo.vespa.config.content.FleetcontrollerConfig; @@ -600,7 +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 (zonesWith16DistributionBits.contains(zone)) + if (zone.system() == SystemName.cd || zonesWith16DistributionBits.contains(zone)) return 16; else return DistributionBitCalculator.getDistributionBits(getNodeCountPerGroup(), getDistributionMode()); |