Author: markrmiller
Date: Thu Jan 21 16:41:42 2010
New Revision: 901765
URL: http://svn.apache.org/viewvc?rev=901765&view=rev
Log:
fix bootstrap config path issue
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java?rev=901765&r1=901764&r2=901765&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
Thu Jan 21 16:41:42 2010
@@ -115,14 +115,16 @@
throw new IllegalArgumentException("bootstrap_confdir must be a
directory of configuration files");
}
String confName = System.getProperty("bootstrap_confname",
"configuration1");
- zooKeeperController.uploadDirToCloud(dir,
ZkController.CONFIGS_ZKNODE + confName);
+ zooKeeperController.uploadDirToCloud(dir,
ZkController.CONFIGS_ZKNODE + "/" + confName);
}
} catch (InterruptedException e) {
// Restore the interrupted status
Thread.currentThread().interrupt();
+ log.error("", e);
+ throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
+ "", e);
} catch (TimeoutException e) {
log.error("Could not connect to ZooKeeper", e);
- log.error("Could not connect to ZooKeeper", e);
throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
"", e);
} catch (IOException e) {
