diff options
| author | Olli Virtanen <olli.virtanen@oath.com> | 2018-11-08 14:54:18 +0100 |
|---|---|---|
| committer | Olli Virtanen <olli.virtanen@oath.com> | 2018-11-08 14:54:18 +0100 |
| commit | 94f6a46855d65620386bc9a41f231ffaa0dab8b9 (patch) | |
| tree | 8f1af4ba6a19a9863eee96fec4c1abcf060e1eba /config-model | |
| parent | 7fac48575f1d6c58ca9ea73e8c554fb32b2f9aa9 (diff) | |
Disable java dispatcher if multi-level dispatching is configured
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index 623a963f77a..fe83148d7af 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -404,23 +404,24 @@ public class IndexedSearchCluster extends SearchCluster nodeBuilder.host(node.getHostName()); nodeBuilder.port(node.getRpcPort()); nodeBuilder.fs4port(node.getDispatchPort()); - if (tuning.dispatch.minActiveDocsCoverage != null) - builder.minActivedocsPercentage(tuning.dispatch.minActiveDocsCoverage); - if (tuning.dispatch.minGroupCoverage != null) - builder.minGroupCoverage(tuning.dispatch.minGroupCoverage); - if (tuning.dispatch.policy != null) { - switch (tuning.dispatch.policy) { - case RANDOM: - builder.distributionPolicy(DistributionPolicy.RANDOM); - break; - case ROUNDROBIN: - builder.distributionPolicy(DistributionPolicy.ROUNDROBIN); - break; - } - } - builder.maxNodesDownPerGroup(rootDispatch.getMaxNodesDownPerFixedRow()); builder.node(nodeBuilder); } + if (tuning.dispatch.minActiveDocsCoverage != null) + builder.minActivedocsPercentage(tuning.dispatch.minActiveDocsCoverage); + if (tuning.dispatch.minGroupCoverage != null) + builder.minGroupCoverage(tuning.dispatch.minGroupCoverage); + if (tuning.dispatch.policy != null) { + switch (tuning.dispatch.policy) { + case RANDOM: + builder.distributionPolicy(DistributionPolicy.RANDOM); + break; + case ROUNDROBIN: + builder.distributionPolicy(DistributionPolicy.ROUNDROBIN); + break; + } + } + builder.maxNodesDownPerGroup(rootDispatch.getMaxNodesDownPerFixedRow()); + builder.useMultilevelDispatch(useMultilevelDispatchSetup()); } @Override |