Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-2040 Hudson hangs AFTER test has finished 

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@594715 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2007-11-13 23:38:21 +00:00
parent 33ab394d4a
commit bf4262e220
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -30,6 +30,7 @@ Trunk (unreleased changes)
HADOOP-2156 BufferUnderflowException for un-named HTableDescriptors HADOOP-2156 BufferUnderflowException for un-named HTableDescriptors
HADOOP-2161 getRow() is orders of magnitudes slower than get(), even on rows HADOOP-2161 getRow() is orders of magnitudes slower than get(), even on rows
with one column (Clint Morgan and Stack) with one column (Clint Morgan and Stack)
HADOOP-2040 Hudson hangs AFTER test has finished
IMPROVEMENTS IMPROVEMENTS
HADOOP-2401 Add convenience put method that takes writable HADOOP-2401 Add convenience put method that takes writable

12
src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
View File

@ -224,23 +224,20 @@ public class MiniHBaseCluster implements HConstants {
*/ */
public void shutdown() { public void shutdown() {
this.hbaseCluster.shutdown(); this.hbaseCluster.shutdown();
try { try {
if (shutdownDFS && cluster != null) { if (shutdownDFS && cluster != null) {
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
LOG.info("Shutting down Mini DFS ");
cluster.shutdown();
if (fs != null) { if (fs != null) {
LOG.info("Shutting down FileSystem"); LOG.info("Shutting down FileSystem");
fs.close(); fs.close();
} }
if (this.cluster != null) {
LOG.info("Shutting down Mini DFS ");
cluster.shutdown();
}
} }
} catch (IOException e) { } catch (IOException e) {
LOG.error("shutdown", e); LOG.error("shutdown", e);
} finally { } finally {
// Delete all DFS files // Delete all DFS files
if(deleteOnExit) { if(deleteOnExit) {
@ -248,7 +245,6 @@ public class MiniHBaseCluster implements HConstants {
StaticTestEnvironment.TEST_DIRECTORY_KEY), "dfs")); StaticTestEnvironment.TEST_DIRECTORY_KEY), "dfs"));
} }
} }
} }
private void deleteFile(File f) { private void deleteFile(File f) {