hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r594715 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
Date Tue, 13 Nov 2007 23:38:23 GMT
Author: stack
Date: Tue Nov 13 15:38:21 2007
New Revision: 594715

URL: http://svn.apache.org/viewvc?rev=594715&view=rev
Log:
HADOOP-2040 Hudson hangs AFTER test has finished

Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java

Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=594715&r1=594714&r2=594715&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Nov 13 15:38:21 2007
@@ -30,6 +30,7 @@
    HADOOP-2156 BufferUnderflowException for un-named HTableDescriptors
    HADOOP-2161 getRow() is orders of magnitudes slower than get(), even on rows
                with one column (Clint Morgan and Stack)
+   HADOOP-2040 Hudson hangs AFTER test has finished
 
   IMPROVEMENTS
     HADOOP-2401 Add convenience put method that takes writable

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java?rev=594715&r1=594714&r2=594715&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
(original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
Tue Nov 13 15:38:21 2007
@@ -224,23 +224,20 @@
    */
   public void shutdown() {
     this.hbaseCluster.shutdown();
-
     try {
       if (shutdownDFS && cluster != null) {
         FileSystem fs = cluster.getFileSystem();
-
-        LOG.info("Shutting down Mini DFS ");
-        cluster.shutdown();
-
         if (fs != null) {
           LOG.info("Shutting down FileSystem");
           fs.close();
         }
+        if (this.cluster != null) {
+          LOG.info("Shutting down Mini DFS ");
+          cluster.shutdown();
+        }
       }
-
     } catch (IOException e) {
       LOG.error("shutdown", e);
-
     } finally {
       // Delete all DFS files
       if(deleteOnExit) {
@@ -248,7 +245,6 @@
             StaticTestEnvironment.TEST_DIRECTORY_KEY), "dfs"));
       }
     }
-
   }
 
   private void deleteFile(File f) {



Mime
View raw message