You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by st...@apache.org on 2012/05/30 23:17:51 UTC

svn commit: r1344467 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java

Author: stack
Date: Wed May 30 21:17:51 2012
New Revision: 1344467

URL: http://svn.apache.org/viewvc?rev=1344467&view=rev
Log:
HBASE-6122 Backup master does not become Active master after ZK exception: REVERT

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java?rev=1344467&r1=1344466&r2=1344467&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java Wed May 30 21:17:51 2012
@@ -210,8 +210,7 @@ class ActiveMasterManager extends ZooKee
         return cleanSetOfActiveMaster;
       }
       // Try to become active master again now that there is no active master
-      cleanSetOfActiveMaster = blockUntilBecomingActiveMaster(startupStatus,
-          clusterStatusTracker);
+      blockUntilBecomingActiveMaster(startupStatus,clusterStatusTracker);
     }
     return cleanSetOfActiveMaster;
   }