--- 0.92/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java 2012-02-22 09:46:09.000000000 -0800 +++ trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java 2012-04-13 13:23:14.000000000 -0700 @@ -79,8 +72,6 @@ // 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 +743,8 @@ master.assignRegion(hri); } + assertTrue(" Table must be enabled.", master.getAssignmentManager() + .getZKTable().isEnabledTable("enabledTable")); // we also need regions assigned out on the dead server List enabledAndOnDeadRegions = new ArrayList(); enabledAndOnDeadRegions.add(enabledRegions.remove(0)); @@ -797,6 +790,9 @@ 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 +919,7 @@ 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