Index: src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java (revision 1344561) +++ src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java (working copy) @@ -210,7 +210,7 @@ return cleanSetOfActiveMaster; } // Try to become active master again now that there is no active master - blockUntilBecomingActiveMaster(startupStatus,clusterStatusTracker); + cleanSetOfActiveMaster = blockUntilBecomingActiveMaster(startupStatus,clusterStatusTracker); } return cleanSetOfActiveMaster; } Index: src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java (revision 1344561) +++ src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java (working copy) @@ -60,8 +60,8 @@ * Negative test of master recovery from zk session expiry. *
* Starts with one master. Fakes the master zk session expired. - * Ensures the master cannot recover the expired zk session since - * the master zk node is still there. + * The master should be able to come up if he is able to create + * the node as active master. * @throws Exception */ @Test(timeout=10000) @@ -70,7 +70,7 @@ HMaster m = cluster.getMaster(); m.abort("Test recovery from zk session expired", new KeeperException.SessionExpiredException()); - assertTrue(m.isStopped()); + assertFalse(m.isStopped()); } /**