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 2014/03/26 21:30:17 UTC
svn commit: r1582038 - in /lucene/dev/trunk/solr: ./
contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
core/src/test/org/apache/solr/cloud/
core/src/test/org/apache/solr/handler/admin/
core/src/test/org/apache/solr/handler/componen...
Author: markrmiller
Date: Wed Mar 26 20:30:16 2014
New Revision: 1582038
URL: http://svn.apache.org/r1582038
Log:
SOLR-5914: Cleanup and fix Solr's test cleanup code.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
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
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 26 20:30:16 2014
@@ -240,6 +240,9 @@ Other Changes
* SOLR-5903: SolrCore implements Closeable, cut over to using try-with-resources
where possible. (Alan Woodward)
+* SOLR-5914: Cleanup and fix Solr's test cleanup code.
+ (Mark Miller, Uwe Schindler)
+
================== 4.7.1 ==================
Versions of Major Components
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Wed Mar 26 20:30:16 2014
@@ -58,7 +58,6 @@ public class TestContentStreamDataSource
@After
public void tearDown() throws Exception {
jetty.stop();
- instance.tearDown();
super.tearDown();
}
@@ -174,9 +173,6 @@ public class TestContentStreamDataSource
FileUtils.copyFile(getFile(CONF_DIR + "dataconfig-contentstream.xml"), f);
}
- public void tearDown() throws Exception {
- recurseDelete(homeDir);
- }
}
private JettySolrRunner createJetty(SolrInstance instance) throws Exception {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java Wed Mar 26 20:30:16 2014
@@ -19,7 +19,6 @@ package org.apache.solr.handler.dataimpo
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,7 +26,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.commons.io.FileUtils;
-import org.apache.http.client.HttpClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java Wed Mar 26 20:30:16 2014
@@ -77,18 +77,6 @@ public class TestMultiCoreConfBootstrap
cores.shutdown();
zkServer.shutdown();
-
- String skip = System.getProperty("solr.test.leavedatadir");
- if (null != skip && 0 != skip.trim().length()) {
- log.info("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());
- } else {
- if (!AbstractSolrTestCase.recurseDelete(dataDir)) {
- log.warn("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
- }
- if (!AbstractSolrTestCase.recurseDelete(dataDir2)) {
- log.warn("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
- }
- }
zkServer = null;
zkDir = null;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java Wed Mar 26 20:30:16 2014
@@ -64,17 +64,6 @@ public class TestZkChroot extends SolrTe
zkServer.shutdown();
- String skip = System.getProperty("solr.test.leavedatadir");
- if (null != skip && 0 != skip.trim().length()) {
- log.info("NOTE: per solr.test.leavedatadir, dataDir will not be removed: "
- + dataDir.getAbsolutePath());
- } else {
- if (!AbstractSolrTestCase.recurseDelete(dataDir)) {
- log.warn("!!!! WARNING: best effort to remove "
- + dataDir.getAbsolutePath() + " FAILED !!!!!");
- }
- }
-
zkServer = null;
zkDir = null;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java Wed Mar 26 20:30:16 2014
@@ -265,7 +265,6 @@ public class CoreAdminHandlerTest extend
if (!runner.isStopped()) {
runner.stop();
}
- recurseDelete(solrHomeDirectory);
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java Wed Mar 26 20:30:16 2014
@@ -20,9 +20,9 @@ package org.apache.solr.handler.componen
import java.io.File;
import java.util.*;
-import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressTempDirCleanUp;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SpellingParams;
@@ -42,6 +42,7 @@ import org.junit.Test;
* @since solr 1.3
*/
@Slow
+@SuppressTempDirCleanUp(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
public class SpellCheckComponentTest extends SolrTestCaseJ4 {
static String rh = "spellCheckCompRH";
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java Wed Mar 26 20:30:16 2014
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.lucene.analysis.Token;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressTempDirCleanUp;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SpellingParams;
import org.apache.solr.common.util.NamedList;
@@ -37,6 +38,7 @@ import org.junit.Test;
/**
* Simple tests for {@link DirectSolrSpellChecker}
*/
+@SuppressTempDirCleanUp(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
public class DirectSolrSpellCheckerTest extends SolrTestCaseJ4 {
private static SpellingQueryConverter queryConverter;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java Wed Mar 26 20:30:16 2014
@@ -23,6 +23,7 @@ import java.util.Set;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressTempDirCleanUp;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.GroupParams;
@@ -41,6 +42,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
@Slow
+@SuppressTempDirCleanUp(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java Wed Mar 26 20:30:16 2014
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.Token;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressTempDirCleanUp;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.SpellCheckComponent;
@@ -32,6 +33,7 @@ import org.apache.solr.util.RefCounted;
import org.junit.BeforeClass;
import org.junit.Test;
+@SuppressTempDirCleanUp(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
@BeforeClass
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=1582038&r1=1582037&r2=1582038&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 Wed Mar 26 20:30:16 2014
@@ -87,15 +87,6 @@ public abstract class MergeIndexesExampl
@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, dataDir will not be removed: " + dataDir2.getAbsolutePath());
- } else {
- if (!recurseDelete(dataDir2)) {
- System.err.println("!!!! WARNING: best effort to remove " + dataDir2.getAbsolutePath() + " FAILED !!!!!");
- }
- }
cores.shutdown();
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=1582038&r1=1582037&r2=1582038&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 Wed Mar 26 20:30:16 2014
@@ -73,14 +73,6 @@ public abstract class MultiCoreExampleTe
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 " + dataDir2.getAbsolutePath() + " FAILED !!!!!");
- }
- }
if(solrCore0 != null) solrCore0.shutdown();
if(solrCore1 != null) solrCore1.shutdown();
if(solrAdmin != null) solrAdmin.shutdown();
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java Wed Mar 26 20:30:16 2014
@@ -81,17 +81,6 @@ public abstract class AbstractEmbeddedSo
deleteAdditionalFiles();
- File dataDir = new File(tempDir,"data");
- String skip = System.getProperty("solr.test.leavedatadir");
- if (null != skip && 0 != skip.trim().length()) {
- log.info("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());
- } else {
- //Removing the temporary directory which contains the index (all other files should have been removed before)
- if (!AbstractSolrTestCase.recurseDelete(tempDir)) {
- log.warn("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
- }
- }
-
super.tearDown();
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Wed Mar 26 20:30:16 2014
@@ -286,9 +286,6 @@ public abstract class BaseDistributedSea
@Override
public void tearDown() throws Exception {
destroyServers();
- if (!AbstractSolrTestCase.recurseDelete(testDir)) {
- System.err.println("!!!! WARNING: best effort to remove " + testDir.getAbsolutePath() + " FAILED !!!!!");
- }
FieldCache.DEFAULT.purgeAllCaches(); // avoid FC insanity
super.tearDown();
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Wed Mar 26 20:30:16 2014
@@ -30,11 +30,9 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -136,6 +134,19 @@ public abstract class SolrTestCaseJ4 ext
public String bugUrl() default "None";
}
+
+ /**
+ * Annotation for test classes to prevent TEMP_DIR cleanup.
+ */
+ @Documented
+ @Inherited
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target(ElementType.TYPE)
+ public @interface SuppressTempDirCleanUp {
+ /** Point to JIRA entry. */
+ public String bugUrl() default "None";
+ }
+
// these are meant to be accessed sequentially, but are volatile just to ensure any test
// thread will read the latest value
protected static volatile SSLTestConfig sslConfig;
@@ -174,23 +185,40 @@ public abstract class SolrTestCaseJ4 ext
@AfterClass
@SuppressWarnings("unused")
private static void afterClass() throws Exception {
- deleteCore();
- resetExceptionIgnores();
- endTrackingSearchers();
- endTrackingZkClients();
- resetFactory();
- coreName = ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME;
- System.clearProperty("jetty.testMode");
- System.clearProperty("tests.shardhandler.randomSeed");
- System.clearProperty("enable.update.log");
- System.clearProperty("useCompoundFile");
- System.clearProperty("urlScheme");
-
- if(isSSLMode()) {
- HttpClientUtil.setConfigurer(new HttpClientConfigurer());
+ try {
+ deleteCore();
+ resetExceptionIgnores();
+ endTrackingSearchers();
+ endTrackingZkClients();
+ resetFactory();
+ coreName = ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME;
+ } finally {
+ try {
+ if (dataDir != null && dataDir.exists() && !recurseDelete(dataDir)) {
+ String msg = "!!!! WARNING: best effort to remove "
+ + dataDir.getAbsolutePath() + " FAILED !!!!!";
+ if (RandomizedContext.current().getTargetClass()
+ .isAnnotationPresent(SuppressTempDirCleanUp.class)) {
+ System.err.println(msg);
+ } else {
+ fail(msg);
+ }
+ }
+ } finally {
+ dataDir = null;
+ System.clearProperty("jetty.testMode");
+ System.clearProperty("tests.shardhandler.randomSeed");
+ System.clearProperty("enable.update.log");
+ System.clearProperty("useCompoundFile");
+ System.clearProperty("urlScheme");
+
+ if (isSSLMode()) {
+ HttpClientUtil.setConfigurer(new HttpClientConfigurer());
+ }
+ // clean up static
+ sslConfig = null;
+ }
}
- // clean up static
- sslConfig = null;
IpTables.unblockAllPorts();
}
@@ -514,7 +542,7 @@ public abstract class SolrTestCaseJ4 ext
/**
* The directory used to story the index managed by the TestHarness h
*/
- protected static File dataDir;
+ protected static volatile File dataDir;
// hack due to File dataDir
protected static String hdfsDataDir;
@@ -634,22 +662,11 @@ public abstract class SolrTestCaseJ4 ext
public static void deleteCore() {
log.info("###deleteCore" );
if (h != null) { h.close(); }
- if (dataDir != null) {
- String skip = System.getProperty("solr.test.leavedatadir");
- if (null != skip && 0 != skip.trim().length()) {
- System.err.println("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());
- } else {
- if (!recurseDelete(dataDir)) {
- System.err.println("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
- }
- }
- }
if (factoryProp == null) {
System.clearProperty("solr.directoryFactory");
}
- dataDir = null;
solrConfig = null;
h = null;
lrf = null;
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=1582038&r1=1582037&r2=1582038&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java Wed Mar 26 20:30:16 2014
@@ -129,19 +129,6 @@ public abstract class AbstractSolrTestCa
return TestHarness.deleteByQuery(q, args);
}
-
- public static boolean recurseDelete(File f) {
- if (f.isDirectory()) {
- for (File sub : f.listFiles()) {
- if (!recurseDelete(sub)) {
- System.err.println("!!!! WARNING: best effort to remove " + sub.getAbsolutePath() + " FAILED !!!!!");
- return false;
- }
- }
- }
- return f.delete();
- }
-
/** @see SolrTestCaseJ4#getFile */
public static File getFile(String name) {
return SolrTestCaseJ4.getFile(name);