diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-07 15:55:42 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-07 15:55:42 +0200 |
commit | ea858c4c3037e5c7625c89f0f2cfc0d92c5dccef (patch) | |
tree | 977ec3fb4bf94e60c8577e1b3315e37cbe8c6f9d /config-model | |
parent | 1e804520e2c03461d9d3b04bca72581b999ffe44 (diff) |
Simplify defaulting logic
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 6 |
1 files changed, 1 insertions, 5 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 3c0e9878f19..b4f8889690e 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,7 +597,7 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri * in config and not remove it again if they reduce the node count. */ public int distributionBits() { - if (zone.environment() == Environment.prod) { + if (zone.environment() == Environment.prod && ! zone.equals(Zone.defaultZone())) { return 16; } else { // hosted test zone, or self-hosted system @@ -607,10 +607,6 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri } } - private Zone createZone(Environment environment, String region) { - return new Zone(environment, RegionName.from(region)); - } - @Override public void validate() throws Exception { super.validate(); |