You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2014/08/18 21:59:40 UTC
svn commit: r1618717 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/core/ConfigSolr.java
solr/core/src/test/org/apache/solr/core/TestSolrXml.java
Author: erick
Date: Mon Aug 18 19:59:40 2014
New Revision: 1618717
URL: http://svn.apache.org/r1618717
Log:
SOLR-6338: coreRootDirectory requires trailing slash, or SolrCloud cores are created in wrong location
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1618717&r1=1618716&r2=1618717&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Aug 18 19:59:40 2014
@@ -207,6 +207,9 @@ Bug Fixes
Java bug #8047340 to SystemInfoHandler: On Turkish default locale, some JVMs fail
to fork on MacOSX, BSD, AIX, and Solaris platforms. (hossman, Uwe Schindler)
+* SOLR-6338: coreRootDirectory requires trailing slash, or SolrCloud cores are created in wrong location.
+ (Primož Skale via Erick Erickson)
+
Optimizations
---------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java?rev=1618717&r1=1618716&r2=1618717&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java Mon Aug 18 19:59:40 2014
@@ -119,7 +119,7 @@ public abstract class ConfigSolr {
* @return core root directory
*/
public String getCoreRootDirectory() {
- return get(CfgProp.SOLR_COREROOTDIRECTORY, config.getResourceLoader().getInstanceDir());
+ return SolrResourceLoader.normalizeDir( get(CfgProp.SOLR_COREROOTDIRECTORY, config.getResourceLoader().getInstanceDir()) );
}
public PluginInfo getShardHandlerFactoryPluginInfo() {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java?rev=1618717&r1=1618716&r2=1618717&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java Mon Aug 18 19:59:40 2014
@@ -69,7 +69,7 @@ public class TestSolrXml extends SolrTes
assertEquals("collection handler class", "testCollectionsHandler", cfg.getCollectionsHandlerClass());
assertEquals("info handler class", "testInfoHandler", cfg.getInfoHandlerClass());
assertEquals("core load threads", 11, cfg.getCoreLoadThreadCount());
- assertEquals("core root dir", "testCoreRootDirectory", cfg.getCoreRootDirectory());
+ assertEquals("core root dir", "testCoreRootDirectory" + File.separator, cfg.getCoreRootDirectory());
assertEquals("distrib conn timeout", 22, cfg.getDistributedConnectionTimeout());
assertEquals("distrib socket timeout", 33, cfg.getDistributedSocketTimeout());
assertEquals("max update conn", 3, cfg.getMaxUpdateConnections());
@@ -95,7 +95,7 @@ public class TestSolrXml extends SolrTes
// Test a few property substitutions that happen to be in solr-50-all.xml.
public void testPropertySub() throws IOException {
- System.setProperty("coreRootDirectory", "myCoreRoot");
+ System.setProperty("coreRootDirectory", "myCoreRoot" + File.separator);
System.setProperty("hostPort", "8888");
System.setProperty("shareSchema", "false");
System.setProperty("socketTimeout", "220");
@@ -105,7 +105,7 @@ public class TestSolrXml extends SolrTes
FileUtils.copyFile(new File(testSrcRoot, "solr-50-all.xml"), new File(solrHome, "solr.xml"));
ConfigSolr cfg = ConfigSolr.fromSolrHome(loader, solrHome.getAbsolutePath());
- assertEquals("core root dir", "myCoreRoot", cfg.getCoreRootDirectory());
+ assertEquals("core root dir", "myCoreRoot" + File.separator, cfg.getCoreRootDirectory());
assertEquals("zk host port", "8888", cfg.getZkHostPort());
assertEquals("schema cache", false, cfg.hasSchemaCache());
}