You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2014/04/19 07:25:03 UTC

svn commit: r1588612 - /hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java

Author: larsh
Date: Sat Apr 19 05:25:02 2014
New Revision: 1588612

URL: http://svn.apache.org/r1588612
Log:
HBASE-11037 Race condition in TestZKBasedOpenCloseRegion.

Modified:
    hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java

Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java?rev=1588612&r1=1588611&r2=1588612&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java Sat Apr 19 05:25:02 2014
@@ -184,25 +184,6 @@ public class TestZKBasedOpenCloseRegion 
 
   }
 
-  @Test (timeout=300000) public void testCloseRegion()
-  throws Exception {
-    LOG.info("Running testCloseRegion");
-    MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
-    LOG.info("Number of region servers = " + cluster.getLiveRegionServerThreads().size());
-
-    int rsIdx = 0;
-    HRegionServer regionServer = TEST_UTIL.getHBaseCluster().getRegionServer(rsIdx);
-    HRegionInfo hri = getNonMetaRegion(ProtobufUtil.getOnlineRegions(regionServer));
-    LOG.debug("Asking RS to close region " + hri.getRegionNameAsString());
-
-    cluster.getMaster().assignmentManager.unassign(hri);
-
-    while (!cluster.getMaster().assignmentManager.wasClosedHandlerCalled(hri)) {
-      Threads.sleep(100);
-    }
-    LOG.info("Done with testCloseRegion");
-  }
-
   private void waitOnRIT() {
     // Close worked but we are going to open the region elsewhere.  Before going on, make sure
     // this completes.
@@ -315,15 +296,5 @@ public class TestZKBasedOpenCloseRegion 
     return getTestFamily();
   }
 
-  public static void main(String args[]) throws Exception {
-    TestZKBasedOpenCloseRegion.beforeAllTests();
-
-    TestZKBasedOpenCloseRegion test = new TestZKBasedOpenCloseRegion();
-    test.setup();
-    test.testCloseRegion();
-
-    TestZKBasedOpenCloseRegion.afterAllTests();
-  }
-
 }