Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1328098 - in /hbase/branches/0.92: CHANGES.txt
 src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
Date: Thu, 19 Apr 2012 20:01:27 -0000
To: commits@hbase.apache.org
From: stack@apache.org
Message-Id: <20120419200127.6AC8F2388962@eris.apache.org>

Author: stack
Date: Thu Apr 19 20:01:26 2012
New Revision: 1328098

URL: http://svn.apache.org/viewvc?rev=1328098&view=rev
Log:
HBASE-5833 0.92 build has been failing pretty consistently on TestMasterFailover....

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1328098&r1=1328097&r2=1328098&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Thu Apr 19 20:01:26 2012
@@ -44,6 +44,7 @@ Release 0.92.2 - Unreleased
    HBASE-5823  HBASE-5823 Hbck should be able to print help (Enis Soztutar)
    HBASE-5787  Table owner can't disable/delete its own table (Matteo)
    HBASE-5821  Incorrect handling of null value in Coprocessor aggregation function min() (Maryann Xue)
+   HBASE-5833  0.92 build has been failing pretty consistently on TestMasterFailover....
 
   IMPROVEMENTS
    HBASE-5592  Make it easier to get a table from shell (Ben West)

Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java?rev=1328098&r1=1328097&r2=1328098&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java Thu Apr 19 20:01:26 2012
@@ -79,8 +79,6 @@ public class TestMasterFailover {
 
     // Create config to use for this cluster
     Configuration conf = HBaseConfiguration.create();
-    conf.setInt("hbase.master.wait.on.regionservers.mintostart", 3);
-    conf.setInt("hbase.master.wait.on.regionservers.maxtostart", 3);
 
     // Start the cluster
     HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(conf);
@@ -752,6 +750,8 @@ public class TestMasterFailover {
       master.assignRegion(hri);
     }
 
+    assertTrue(" Table must be enabled.", master.getAssignmentManager()
+        .getZKTable().isEnabledTable("enabledTable"));
     // we also need regions assigned out on the dead server
     List<HRegionInfo> enabledAndOnDeadRegions = new ArrayList<HRegionInfo>();
     enabledAndOnDeadRegions.add(enabledRegions.remove(0));
@@ -797,6 +797,9 @@ public class TestMasterFailover {
     ZKTable zktable = new ZKTable(zkw);
     zktable.setDisabledTable(Bytes.toString(disabledTable));
 
+    assertTrue(" The enabled table should be identified on master fail over.",
+        zktable.isEnabledTable("enabledTable"));
+
     /*
      * ZK = CLOSING
      */
@@ -923,7 +926,7 @@ public class TestMasterFailover {
       Thread.sleep(100);
     }
     LOG.debug("\n\nRegion of disabled table was open at steady-state on dead RS"
-        + "\n" + region + "\n\n");
+      + "\n" + region + "\n\n");
 
     /*
      * DONE MOCKING