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

SOLR-8564: Fix Embedded ZooKeeper to use <solrHome>/zoo_data for it's data directory 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1725273 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Varun Thacker 2016-01-18 13:58:02 +00:00
parent 9a39200e2b
commit db7653e3ef
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -402,6 +402,8 @@ Bug Fixes
* SOLR-8548: Core discovery was not following symlinks (Aaron LaBella via Alan
Woodward)
* SOLR-8564: Fix Embedded ZooKeeper to use <solrHome>/zoo_data for it's data directory
Optimizations
----------------------

2
solr/core/src/java/org/apache/solr/core/ZkContainer.java
View File

@ -78,7 +78,7 @@ public class ZkContainer {
System.setProperty("zookeeper.jmx.log4j.disable", "true");
if (zkRun != null) {
String zkDataHome = System.getProperty("zkServerDataDir", solrHome + "zoo_data");
String zkDataHome = System.getProperty("zkServerDataDir", Paths.get(solrHome).resolve("zoo_data").toString());
String zkConfHome = System.getProperty("zkServerConfDir", solrHome);
zkServer = new SolrZkServer(stripChroot(zkRun), stripChroot(config.getZkHost()), zkDataHome, zkConfHome, config.getSolrHostPort());
zkServer.parseConfig();