diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-06-08 18:28:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-08 18:28:24 +0200 |
commit | e3bda63e89a8b75edba41ec589de5b7ce1c934ba (patch) | |
tree | 9df26fe7a37a95b542424b3d0915b5bc919a5b4b /config-model/src/main | |
parent | 1d9fa64879ffe408aea0d5a754727e85668d3b93 (diff) | |
parent | 12ba2fae9ed9e7bf1b7bedc5c342af7cabf75240 (diff) |
Merge pull request #27354 from vespa-engine/vekterli/16-distribution-bits-in-perf
Always use 16 distribution bits in perf environments
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 7 |
1 files changed, 6 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 dfdfa9303a7..2592beca6c6 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 @@ -519,7 +519,7 @@ public class ContentCluster extends TreeConfigProducer<AnyConfigProducer> implem * in config and not remove it again if they reduce the node count. */ public int distributionBits() { - if (zone.environment() == Environment.prod && ! zone.equals(Zone.defaultZone())) { + if (zoneEnvImplies16DistributionBits() && ! zone.equals(Zone.defaultZone())) { return 16; } else { // hosted test zone, or self-hosted system @@ -529,6 +529,11 @@ public class ContentCluster extends TreeConfigProducer<AnyConfigProducer> implem } } + private boolean zoneEnvImplies16DistributionBits() { + // We want perf to behave like prod as much as possible. + return (zone.environment() == Environment.prod) || (zone.environment() == Environment.perf); + } + public boolean isHosted() { return isHosted; } |