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 2011/08/18 18:37:13 UTC
svn commit: r1159304 - in /lucene/dev/trunk/solr:
example/multicore/core0/conf/ example/multicore/core1/conf/
solrj/src/test/org/apache/solr/client/solrj/
Author: markrmiller
Date: Thu Aug 18 16:37:13 2011
New Revision: 1159304
URL: http://svn.apache.org/viewvc?rev=1159304&view=rev
Log:
SOLR-2717: Some tests annoyingly use a data dir under example/multicore/core0|1 - worse, more than one test does this, so sometimes they can stomp on each other.
Modified:
lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
Modified: lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml?rev=1159304&r1=1159303&r2=1159304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml Thu Aug 18 16:37:13 2011
@@ -27,6 +27,7 @@
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+ <dataDir>${solr.core0.data.dir:}</dataDir>
<updateHandler class="solr.DirectUpdateHandler2" />
Modified: lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml?rev=1159304&r1=1159303&r2=1159304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml Thu Aug 18 16:37:13 2011
@@ -27,6 +27,8 @@
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+ <dataDir>${solr.core1.data.dir:}</dataDir>
+
<updateHandler class="solr.DirectUpdateHandler2" />
<requestDispatcher handleSelect="true" >
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java?rev=1159304&r1=1159303&r2=1159304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java Thu Aug 18 16:37:13 2011
@@ -27,6 +27,7 @@ import org.apache.solr.core.CoreContaine
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.ExternalPaths;
+import java.io.File;
import java.io.IOException;
/**
@@ -38,6 +39,7 @@ import java.io.IOException;
public abstract class MergeIndexesExampleTestBase extends SolrExampleTestBase {
// protected static final CoreContainer cores = new CoreContainer();
protected static CoreContainer cores;
+ private File dataDir2;
@Override
public String getSolrHome() {
@@ -54,12 +56,37 @@ public abstract class MergeIndexesExampl
return getSolrHome() + "/core0/conf/solrconfig.xml";
}
- @Override
public void setUp() throws Exception {
+ System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
super.setUp();
+
cores = h.getCoreContainer();
SolrCore.log.info("CORES=" + cores + " : " + cores.getCoreNames());
cores.setPersistent(false);
+
+ // setup datadirs
+ System.setProperty( "solr.core0.data.dir", this.dataDir.getCanonicalPath() );
+
+ dataDir2 = new File(TEMP_DIR, getClass().getName() + "-"
+ + System.currentTimeMillis());
+ dataDir2.mkdirs();
+
+ System.setProperty( "solr.core1.data.dir", this.dataDir2.getCanonicalPath() );
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ String skip = System.getProperty("solr.test.leavedatadir");
+ if (null != skip && 0 != skip.trim().length()) {
+ System.err.println("NOTE: per solr.test.leavedatadir, dataDir2 will not be removed: " + dataDir2.getAbsolutePath());
+ } else {
+ if (!recurseDelete(dataDir2)) {
+ System.err.println("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
+ }
+ }
+
}
@Override
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java?rev=1159304&r1=1159303&r2=1159304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java Thu Aug 18 16:37:13 2011
@@ -41,7 +41,8 @@ public abstract class MultiCoreExampleTe
{
// protected static final CoreContainer cores = new CoreContainer();
protected static CoreContainer cores;
-
+ private File dataDir2;
+
@Override public String getSolrHome() { return ExternalPaths.EXAMPLE_MULTICORE_HOME; }
@Override public String getSchemaFile() { return getSolrHome()+"/core0/conf/schema.xml"; }
@@ -52,6 +53,26 @@ public abstract class MultiCoreExampleTe
cores = h.getCoreContainer();
SolrCore.log.info("CORES=" + cores + " : " + cores.getCoreNames());
cores.setPersistent(false);
+
+ dataDir2 = new File(TEMP_DIR, getClass().getName() + "-"
+ + System.currentTimeMillis());
+ dataDir2.mkdirs();
+
+ System.setProperty( "solr.core1.data.dir", this.dataDir2.getCanonicalPath() );
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ String skip = System.getProperty("solr.test.leavedatadir");
+ if (null != skip && 0 != skip.trim().length()) {
+ System.err.println("NOTE: per solr.test.leavedatadir, dataDir2 will not be removed: " + dataDir2.getAbsolutePath());
+ } else {
+ if (!recurseDelete(dataDir2)) {
+ System.err.println("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
+ }
+ }
}
@Override