diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-07 15:48:27 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-07 15:48:27 +0200 |
| commit | 1e804520e2c03461d9d3b04bca72581b999ffe44 (patch) | |
| tree | 1be6abaae4ffc11b065685087c70c5c80fa05b2d /config-model | |
| parent | 34c21f95bf2a80f35e24dd8581940bf918dd5627 (diff) | |
Default to 16 bits in prod
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 17 |
1 files changed, 6 insertions, 11 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 1dc4bdf4259..3c0e9878f19 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 @@ -597,19 +597,14 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri * in config and not remove it again if they reduce the node count. */ public int distributionBits() { - // TODO: Enable for all hosted zones (i.e when zone isn't default) - List<Zone> zonesWith16DistributionBits = Arrays.asList(createZone(Environment.prod, "us-west-1"), - createZone(Environment.prod, "us-central-1"), - createZone(Environment.prod, "eu-west-1"), - createZone(Environment.prod, "ap-northeast-1"), - createZone(Environment.prod, "ap-northeast-2"), - createZone(Environment.prod, "ap-southeast-1"), - createZone(Environment.prod, "ap-aue-1"), - createZone(Environment.prod, "us-east-3")); - if (zone.system() == SystemName.cd || zonesWith16DistributionBits.contains(zone)) + if (zone.environment() == Environment.prod) { return 16; - else + } + else { // hosted test zone, or self-hosted system + // hosted test zones: have few nodes and use visiting in tests: This is slow with 16 bits (to many buckets) + // self hosted systems: should probably default to 16 bits, but the transition may cause problems return DistributionBitCalculator.getDistributionBits(getNodeCountPerGroup(), getDistributionMode()); + } } private Zone createZone(Environment environment, String region) { |