diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-02-03 14:48:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 14:48:47 +0100 |
| commit | 77f94db089a52a536e47f94753ed130d57c70bee (patch) | |
| tree | 9ec3074aacfd7c87f70557e95c6af20e43e93455 /config-model | |
| parent | 3f767dc3d25567018fbd906cdbfaaac5a5c70043 (diff) | |
| parent | d9f82731cb7c47162e7a93b6cb6c1990cbb879fb (diff) | |
Merge pull request #16371 from vespa-engine/bratseth/minor-fixes
No functional changes
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java | 10 |
1 files changed, 7 insertions, 3 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 d7df62d56cf..7ce72b138c1 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 @@ -189,7 +189,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> } } - private ContentSearchCluster(AbstractConfigProducer parent, + private ContentSearchCluster(AbstractConfigProducer<?> parent, String clusterName, ModelContext.FeatureFlags featureFlags, Map<String, NewDocumentType> documentDefinitions, @@ -232,8 +232,8 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> NamedSchema searchDefinition = schemaDefinitionXMLHandler.getResponsibleSearchDefinition(deployState.getSchemas()); if (searchDefinition == null) - throw new RuntimeException("Search definition parsing error or file does not exist: '" + - schemaDefinitionXMLHandler.getName() + "'"); + throw new RuntimeException("Schema '" + schemaDefinitionXMLHandler.getName() + "' referenced in " + + this + " does not exist"); // TODO: remove explicit building of user configs when the complete content model is built using builders. sc.getLocalSDS().add(new AbstractSearchCluster.SchemaSpec(searchDefinition, @@ -444,4 +444,8 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> public IndexedSearchCluster getIndexed() { return indexedCluster; } public boolean hasIndexedCluster() { return indexedCluster != null; } public String getClusterName() { return clusterName; } + + @Override + public String toString() { return "content cluster '" + clusterName + "'"; } + } |