svn commit: r1095140 - /hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java

[st...@apache.org]

Author: stack
Date: Tue Apr 19 17:13:29 2011
New Revision: 1095140

URL: http://svn.apache.org/viewvc?rev=1095140&view=rev
Log:
Attempted fix for test that fails sporadically; allow that on split, the zk state can be SPLIT or SPLITTING (We were expecting SPLIT but looking in logs, it could run slower and be in SPLITING when zk state is tested

Modified:
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1095140&r1=1095139&r2=1095140&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java Tue Apr 19 17:13:29 2011
@@ -150,7 +150,7 @@ public class TestSplitTransactionOnClust
   }
 
   /**
-   * Test that intentionally has master fail the processing of the split message.
+   * A test that intentionally has master fail the processing of the split message.
    * Tests that the regionserver split ephemeral node gets cleaned up if it
    * crashes and that after we process server shutdown, the daughters are up on
    * line.
@@ -200,7 +200,9 @@ public class TestSplitTransactionOnClust
       RegionTransitionData rtd =
         ZKAssign.getData(t.getConnection().getZooKeeperWatcher(),
           hri.getEncodedName());
-      assertTrue(rtd.getEventType().equals(EventType.RS_ZK_REGION_SPLIT));
+      // State could be SPLIT or SPLITTING.
+      assertTrue(rtd.getEventType().equals(EventType.RS_ZK_REGION_SPLIT) ||
+        rtd.getEventType().equals(EventType.RS_ZK_REGION_SPLITTING));
       // Now crash the server
       cluster.abortRegionServer(tableRegionIndex);
       while(server.getOnlineRegions().size() > 0) {