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

SOLR-7092: Do a little better at clean up in new test code. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1668412 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2015-03-22 17:12:07 +00:00
parent 4e01da3843
commit 28abd3f23d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
View File

@ -44,6 +44,8 @@ public class HdfsTestUtil {
private static FSDataOutputStream badTlogOutStream;
private static FileSystem badTlogOutStreamFs;
public static MiniDFSCluster setupClass(String dir) throws Exception {
return setupClass(dir, true);
}
@ -94,12 +96,13 @@ public class HdfsTestUtil {
timers.put(dfsCluster, timer);
} else {
// TODO: we could do much better at testing this
// force a lease recovery by creating a tlog file and not closing it
URI uri = dfsCluster.getURI();
Path hdfsDirPath = new Path(uri.toString() + "/solr/collection1/core_node1/data/tlog/tlog.0000000000000000000");
// tran log already being created testing
FileSystem fs = FileSystem.newInstance(hdfsDirPath.toUri(), conf);
badTlogOutStream = fs.create(hdfsDirPath);
badTlogOutStreamFs = FileSystem.get(hdfsDirPath.toUri(), conf);
badTlogOutStream = badTlogOutStreamFs.create(hdfsDirPath);
}
SolrTestCaseJ4.useFactory("org.apache.solr.core.HdfsDirectoryFactory");
@ -113,6 +116,10 @@ public class HdfsTestUtil {
IOUtils.closeQuietly(badTlogOutStream);
}
if (badTlogOutStreamFs != null) {
IOUtils.closeQuietly(badTlogOutStreamFs);
}
SolrTestCaseJ4.resetFactory();
System.clearProperty("solr.lock.type");
System.clearProperty("test.build.data");
@ -120,7 +127,10 @@ public class HdfsTestUtil {
System.clearProperty("solr.hdfs.home");
System.clearProperty("solr.hdfs.blockcache.global");
if (dfsCluster != null) {
timers.remove(dfsCluster);
Timer timer = timers.remove(dfsCluster);
if (timer != null) {
timer.cancel();
}
dfsCluster.shutdown();
}