You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2011/07/13 11:23:56 UTC
svn commit: r1145927 - in /hbase/trunk: CHANGES.txt
src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
Author: tedyu
Date: Wed Jul 13 09:23:56 2011
New Revision: 1145927
URL: http://svn.apache.org/viewvc?rev=1145927&view=rev
Log:
HBASE-4075 A bug in TestZKBasedOpenCloseRegion
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1145927&r1=1145926&r2=1145927&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Jul 13 09:23:56 2011
@@ -159,6 +159,7 @@ Release 0.91.0 - Unreleased
HBASE-4077 Deadlock if WrongRegionException is thrown from getLock in
HRegion.delete (Adam Warrington via Ted Yu)
HBASE-3893 HRegion.internalObtainRowLock shouldn't wait forever
+ HBASE-4075 A bug in TestZKBasedOpenCloseRegion (Jieshan Bean via Ted Yu)
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java?rev=1145927&r1=1145926&r2=1145927&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java Wed Jul 13 09:23:56 2011
@@ -188,31 +188,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(regionServer.getOnlineRegions());
- LOG.debug("Asking RS to close region " + hri.getRegionNameAsString());
-
- AtomicBoolean closeEventProcessed = new AtomicBoolean(false);
- EventHandlerListener listener =
- new CloseRegionEventListener(hri.getRegionNameAsString(),
- closeEventProcessed);
- cluster.getMaster().executorService.registerListener(EventType.RS_ZK_REGION_CLOSED, listener);
-
- cluster.getMaster().assignmentManager.unassign(hri);
-
- while (!closeEventProcessed.get()) {
- Threads.sleep(100);
- }
- LOG.info("Done with testCloseRegion");
- }
-
public static class CloseRegionEventListener implements EventHandlerListener {
private static final Log LOG = LogFactory.getLog(CloseRegionEventListener.class);
String regionToClose;
@@ -301,6 +276,31 @@ 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(regionServer.getOnlineRegions());
+ LOG.debug("Asking RS to close region " + hri.getRegionNameAsString());
+
+ AtomicBoolean closeEventProcessed = new AtomicBoolean(false);
+ EventHandlerListener listener =
+ new CloseRegionEventListener(hri.getRegionNameAsString(),
+ closeEventProcessed);
+ cluster.getMaster().executorService.registerListener(EventType.RS_ZK_REGION_CLOSED, listener);
+
+ cluster.getMaster().assignmentManager.unassign(hri);
+
+ while (!closeEventProcessed.get()) {
+ Threads.sleep(100);
+ }
+ LOG.info("Done with testCloseRegion");
+ }
+
private static void waitUntilAllRegionsAssigned()
throws IOException {
HTable meta = new HTable(TEST_UTIL.getConfiguration(),