Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge up to 923909 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/solr@924064 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-03-16 23:59:42 +00:00
parent 3dabccdb6d 92e2e200a3
commit 5d9b7b2089
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/java/org/apache/solr/core/CoreContainer.java
View File

@ -69,9 +69,14 @@ public class CoreContainer
protected boolean shareSchema;
protected String solrHome;
protected String solrConfigFilenameOverride;
private String defaultCoreName = "";
// assigned by Initializer
private boolean defaultAbortOnConfigError = false;
// number of cores that either explicitly, or because of
// default, said to abort on config error
private int numCoresAbortOnConfigError = 0;
public CoreContainer() {
solrHome = SolrResourceLoader.locateSolrHome();
}
@ -83,12 +88,18 @@ public class CoreContainer
// Helper class to initialize the CoreContainer
public static class Initializer {
protected String solrConfigFilename = null;
// default to true for legacy behavior
protected boolean abortOnConfigurationError = true;
public boolean isAbortOnConfigurationError() {
return abortOnConfigurationError;
}
/** Note for no good reason what so ever, this method has only ever
* influenced the default behavior of "single core" mode. when using
* solr.xml values specified this way are ignored, and false is the default.
* initialize() will modify this value.
*/
public void setAbortOnConfigurationError(boolean abortOnConfigurationError) {
this.abortOnConfigurationError = abortOnConfigurationError;
}
@ -111,20 +122,17 @@ public class CoreContainer
log.info("looking for solr.xml: " + fconf.getAbsolutePath());
cores = new CoreContainer();
cores.solrConfigFilenameOverride = solrConfigFilename;
if (fconf.exists())
if (fconf.exists()) {
// default abortOnConfigurationError ignored in multicore
cores.defaultAbortOnConfigError = false;
cores.load(solrHome, fconf);
else {
} else {
cores.defaultAbortOnConfigError = abortOnConfigurationError;
cores.load(solrHome, new ByteArrayInputStream(DEF_SOLR_XML.getBytes()));
cores.configFile = fconf;
}
abortOnConfigurationError = false;
// if any core aborts on startup, then abort
for (SolrCore c : cores.getCores()) {
if (c.getSolrConfig().getBool("abortOnConfigurationError", false)) {
abortOnConfigurationError = true;
break;
}
}
setAbortOnConfigurationError(0 < cores.numCoresAbortOnConfigError);
solrConfigFilename = cores.getConfigFile().getName();
return cores;
@ -404,6 +412,11 @@ public class CoreContainer
// Initialize the solr config
SolrResourceLoader solrLoader = new SolrResourceLoader(instanceDir, libLoader, getCoreProps(instanceDir, dcore.getPropertiesName(),dcore.getCoreProperties()));
SolrConfig config = new SolrConfig(solrLoader, dcore.getConfigName(), null);
if (config.getBool("abortOnConfigurationError",defaultAbortOnConfigError)) {
numCoresAbortOnConfigError++;
}
IndexSchema schema = null;
if(indexSchemaCache != null){
//schema sharing is enabled. so check if it already is loaded