svn commit: r1170792 - in /hbase/trunk: CHANGES.txt src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java

[todd]

Author: todd
Date: Wed Sep 14 19:28:30 2011
New Revision: 1170792

URL: http://svn.apache.org/viewvc?rev=1170792&view=rev
Log:
HBASE-4406  TestOpenRegionHandler failing after HBASE-4287

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1170792&r1=1170791&r2=1170792&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Sep 14 19:28:30 2011
@@ -261,6 +261,7 @@ Release 0.91.0 - Unreleased
    HBASE-4340  Hbase can't balance if ServerShutdownHandler encountered
                exception (Jinchao Gao)
    HBASE-4394  Add support for seeking hints to FilterList
+   HBASE-4406  TestOpenRegionHandler failing after HBASE-4287 (todd)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java?rev=1170792&r1=1170791&r2=1170792&view=diff
==============================================================================
--- 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
 (original)
+++ 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
 Wed Sep 14 19:28:30 2011
@@ -37,12 +37,14 @@ import org.apache.hadoop.hbase.executor.
 import org.apache.hadoop.hbase.executor.EventHandler.EventType;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.zookeeper.ZKAssign;
 import org.apache.hadoop.hbase.zookeeper.ZKUtil;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NodeExistsException;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -57,9 +59,9 @@ public class TestOpenRegionHandler {
   private final static HBaseTestingUtility HTU = new HBaseTestingUtility();
   private static final HTableDescriptor TEST_HTD =
     new HTableDescriptor("TestOpenRegionHandler.java");
-  private static final HRegionInfo TEST_HRI = 
-    new HRegionInfo(TEST_HTD.getName(), HConstants.EMPTY_END_ROW,
-          HConstants.EMPTY_END_ROW);
+  private HRegionInfo TEST_HRI;
+
+  private int testIndex = 0;
 
   @BeforeClass public static void before() throws Exception {
     HTU.startMiniZKCluster();
@@ -70,6 +72,19 @@ public class TestOpenRegionHandler {
   }
 
   /**
+   * Before each test, use a different HRI, so the different tests
+   * don't interfere with each other. This allows us to use just
+   * a single ZK cluster for the whole suite.
+   */
+  @Before
+  public void setupHRI() {
+    TEST_HRI = new HRegionInfo(TEST_HTD.getName(),
+      Bytes.toBytes(testIndex),
+      Bytes.toBytes(testIndex + 1));
+    testIndex++;
+  }
+
+  /**
    * Test the openregionhandler can deal with its znode being yanked out from
    * under it.
    * @see <a 
href="https://issues.apache.org/jira/browse/HBASE-3627";>HBASE-3627</a>
@@ -164,4 +179,4 @@ public class TestOpenRegionHandler {
     assertEquals(EventType.RS_ZK_REGION_FAILED_OPEN, data.getEventType());
   }
   
-}
\ No newline at end of file
+}