You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/07/10 17:43:47 UTC
svn commit: r1359732 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Author: markrmiller
Date: Tue Jul 10 15:43:47 2012
New Revision: 1359732
URL: http://svn.apache.org/viewvc?rev=1359732&view=rev
Log:
SOLR-3612: Race condition when starting an embedded zk ensemble
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1359732&r1=1359731&r2=1359732&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Tue Jul 10 15:43:47 2012
@@ -221,9 +221,17 @@ public class CoreContainer
}
return descriptors;
}
- });
-
+ });
+
String confDir = System.getProperty("bootstrap_confdir");
+ boolean boostrapConf = Boolean.getBoolean("bootstrap_conf");
+
+ if (zkRun != null && zkServer.getServers().size() > 1 && confDir == null && boostrapConf == false) {
+ // we are part of an ensemble and we are not uploading the config - pause to give the config time
+ // to get up
+ Thread.sleep(10000);
+ }
+
if(confDir != null) {
File dir = new File(confDir);
if(!dir.isDirectory()) {
@@ -232,8 +240,9 @@ public class CoreContainer
String confName = System.getProperty(ZkController.COLLECTION_PARAM_PREFIX+ZkController.CONFIGNAME_PROP, "configuration1");
zkController.uploadConfigDir(dir, confName);
}
+
+
- boolean boostrapConf = Boolean.getBoolean("bootstrap_conf");
if(boostrapConf) {
ZkController.bootstrapConf(zkController.getZkClient(), cfg, solrHome);
}