HoustonPutman commented on a change in pull request #558:
URL: https://github.com/apache/solr/pull/558#discussion_r793762567
##########
File path: solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
##########
@@ -161,14 +162,21 @@ public static NodeConfig fromConfig(Path solrHome,
XmlConfigFile config, boolean
}
public static NodeConfig fromFile(Path solrHome, Path configFile, Properties
substituteProps) {
-
- log.info("Loading container configuration from {}", configFile);
-
if (!Files.exists(configFile)) {
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
- "solr.xml does not exist in " + configFile.getParent() + " cannot
start Solr");
+ if (Boolean.getBoolean("solr.solrxml.required")) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+ "solr.xml does not exist in " + configFile.getParent() + " cannot
start Solr");
+ }
+ log.info("Container configuration not found in SOLR_HOME, using built-in
default");
Review comment:
Maybe use `solr.xml` instead of `Container configuration`?
##########
File path: solr/bin/solr
##########
@@ -2069,8 +2069,11 @@ if [ "$SOLR_MODE" == 'solrcloud' ]; then
CLOUD_MODE_OPTS+=('-Dbootstrap_confdir=./solr/collection1/conf'
'-Dcollection.configName=myconf' '-DnumShards=1')
fi
+ if [ -n "$SOLR_SOLRXML_REQUIRED" ]; then
Review comment:
Shouldn't this and the one be `== true`, like in the `.cmd` version?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
