diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-05-29 14:35:39 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-29 14:35:39 +0200 |
| commit | 7f794ed31ee69f9952879311033456c465cd3e50 (patch) | |
| tree | bdd3ac00b99f232a3eb3b069de1279d0c29ef914 /config-model | |
| parent | 7f7ae6ce2f47ae66f40db75e79f86cbaad1e1d83 (diff) | |
Non-functional changes only
Diffstat (limited to 'config-model')
3 files changed, 6 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java index ee854aaa9c3..93e1ce2a81e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java @@ -24,6 +24,7 @@ public class NodeResourcesTuning implements ProtonConfig.Producer { public NodeResourcesTuning(NodeResources resources, int redundancy, int searchableCopies) { this(resources, redundancy, searchableCopies, 1); } + public NodeResourcesTuning(NodeResources resources, int redundancy, int searchableCopies, int threadsPerSearch) { this.resources = resources; this.redundancy = redundancy; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java index c1498936280..5d8c8d51625 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java @@ -270,9 +270,10 @@ public class SearchNode extends AbstractService implements builder.pruneremoveddocumentsage(4 * 24 * 3600 + 3600 + 60); } if (getHostResource() != null && ! getHostResource().realResources().isUnspecified()) { - var nodeResourcesTuning = tuning.isPresent() - ? new NodeResourcesTuning(getHostResource().realResources(), redundancy, searchableCopies, tuning.get().getNumThreadsPerSearch()) - : new NodeResourcesTuning(getHostResource().realResources(), redundancy, searchableCopies); + var nodeResourcesTuning = new NodeResourcesTuning(getHostResource().realResources(), + redundancy, + searchableCopies, + tuning.map(Tuning::threadsPerSearch).orElse(1)); nodeResourcesTuning.getConfig(builder); tuning.ifPresent(t -> t.getConfig(builder)); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java index 5984aad7f16..d8a2e67bf9a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java @@ -406,7 +406,7 @@ public class Tuning extends AbstractConfigProducer implements ProtonConfig.Produ if (searchNode != null) searchNode.getConfig(builder); } - public int getNumThreadsPerSearch() { + public int threadsPerSearch() { if (searchNode == null) return 1; if (searchNode.threads == null) return 1; if (searchNode.threads.numThreadsPerSearch == null) return 1; |