diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-01-16 15:13:39 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-01-16 15:13:39 +0100 |
| commit | 42216bbf523081f5c0c41e898d6dcab072069b23 (patch) | |
| tree | 2c2927519ffd8f13ad85aacc3d484b9d086ba8df /config-model | |
| parent | 27dda4f0e0e0de83e7ada924761000fc7d51dc98 (diff) | |
Better error message
Diffstat (limited to 'config-model')
3 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index cae7ede463d..75161859068 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -266,9 +266,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot private Tuning tuning; - public void setTuning(Tuning t) { - tuning = t; - } + public void setTuning(Tuning tuning) { this.tuning = tuning; } private void setResourceLimits(ResourceLimits resourceLimits) { this.resourceLimits = Optional.of(resourceLimits); 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 716aa87d0c2..e7a3439e6bb 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 @@ -171,13 +171,12 @@ public class ContentCluster extends AbstractConfigProducer implements Double queryTimeout = search.getQueryTimeout(); if (queryTimeout != null) { Preconditions.checkState(index.getQueryTimeout() == null, - "You may not specify query-timeout in both proton and content."); + "In " + index + ": You may not specify query-timeout in both proton and content."); index.setQueryTimeout(queryTimeout); } Double visibilityDelay = search.getVisibilityDelay(); - if (visibilityDelay != null) { + if (visibilityDelay != null) index.setVisibilityDelay(visibilityDelay); - } index.setSearchCoverage(DomSearchCoverageBuilder.build(element)); index.setDispatchSpec(DomDispatchBuilder.build(element)); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java index 85663a59556..8a88e720bed 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java @@ -86,6 +86,9 @@ public abstract class AbstractSearchCluster extends AbstractConfigProducer public abstract void getConfig(RankProfilesConfig.Builder builder); public abstract void getConfig(AttributesConfig.Builder builder); + @Override + public String toString() { return "search-capable cluster '" + clusterName + "'"; } + public static final class IndexingMode { public static final IndexingMode REALTIME = new IndexingMode("REALTIME"); |