svn commit: r939862 - in /hadoop/hbase/branches/0.20/src: contrib/stargate/src/test/org/apache/hadoop/hbase/stargate/ contrib/transactional/src/test/org/apache/hadoop/hbase/regionserver/transactional/ java/org/apache/hadoop/hbase/util/ test/org/apache/...

[stack]

Author: stack
Date: Fri Apr 30 22:46:36 2010
New Revision: 939862

URL: http://svn.apache.org/viewvc?rev=939862&view=rev
Log:
More fixing broke build, build broken by hbase-2414 commit

Removed:
    
hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/util/TestMigration.java
Modified:
    
hadoop/hbase/branches/0.20/src/contrib/stargate/src/test/org/apache/hadoop/hbase/stargate/MiniClusterTestCase.java
    
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/regionserver/transactional/TestTHLogRecovery.java
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java

Modified: 
hadoop/hbase/branches/0.20/src/contrib/stargate/src/test/org/apache/hadoop/hbase/stargate/MiniClusterTestCase.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/stargate/src/test/org/apache/hadoop/hbase/stargate/MiniClusterTestCase.java?rev=939862&r1=939861&r2=939862&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/contrib/stargate/src/test/org/apache/hadoop/hbase/stargate/MiniClusterTestCase.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/contrib/stargate/src/test/org/apache/hadoop/hbase/stargate/MiniClusterTestCase.java
 Fri Apr 30 22:46:36 2010
@@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.MiniHBase
 import org.apache.hadoop.hbase.MiniZooKeeperCluster;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.hbase.util.JVMClusterUtil;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.log4j.Level;
@@ -135,8 +136,8 @@ public class MiniClusterTestCase extends
   
   private static void stopHBase() {
     if (hbaseCluster != null) try {
-      for (LocalHBaseCluster.RegionServerThread regionThread:
-        hbaseCluster.getRegionThreads()) {
+      for (JVMClusterUtil.RegionServerThread regionThread:
+        hbaseCluster.getRegionServerThreads()) {
         regionThread.getRegionServer().abort();
       }
       hbaseCluster.shutdown();

Modified: 
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/regionserver/transactional/TestTHLogRecovery.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/regionserver/transactional/TestTHLogRecovery.java?rev=939862&r1=939861&r2=939862&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/regionserver/transactional/TestTHLogRecovery.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/regionserver/transactional/TestTHLogRecovery.java
 Fri Apr 30 22:46:36 2010
@@ -47,6 +47,7 @@ import org.apache.hadoop.hbase.ipc.Trans
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JVMClusterUtil;
 
 public class TestTHLogRecovery extends HBaseClusterTestCase {
   private static final Log LOG = LogFactory.getLog(TestTHLogRecovery.class);
@@ -142,8 +143,8 @@ public class TestTHLogRecovery extends H
   // }
 
   private void flushRegionServer() {
-    List<LocalHBaseCluster.RegionServerThread> regionThreads = cluster
-        .getRegionThreads();
+    List<JVMClusterUtil.RegionServerThread> regionThreads = cluster
+        .getRegionServerThreads();
 
     HRegion region = null;
     int server = -1;
@@ -172,8 +173,8 @@ public class TestTHLogRecovery extends H
    * just shut down.
    */
   private void stopOrAbortRegionServer(final boolean abort) {
-    List<LocalHBaseCluster.RegionServerThread> regionThreads = cluster
-        .getRegionThreads();
+    List<JVMClusterUtil.RegionServerThread> regionThreads = cluster
+        .getRegionServerThreads();
 
     int server = -1;
     for (int i = 0; i < regionThreads.size(); i++) {

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java?rev=939862&r1=939861&r2=939862&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
 Fri Apr 30 22:46:36 2010
@@ -147,8 +147,14 @@ public class JVMClusterUtil {
         }
       }
     }
-    if (hdfsClientFinalizer != null) hdfsClientFinalizer.start();
-    Threads.shutdown(hdfsClientFinalizer);
+    if (hdfsClientFinalizer != null) {
+      // Don't run the shutdown thread.  Plays havoc if we try to start a
+      // minihbasecluster immediately after this one has gone down (In
+      // Filesystem, the shutdown thread is kept in a static and is created
+      // on classloading.  Can only run it once).
+      // hdfsClientFinalizer.start();
+      // Threads.shutdown(hdfsClientFinalizer);
+    }
     LOG.info("Shutdown " +
       ((regionservers != null)? master.getName(): "0 masters") +
       " " + regionservers.size() + " region server(s)");