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

Posted to commits@hbase.apache.org by ra...@apache.org on 2012/05/30 19:01:38 UTC

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

Author: ramkrishna
Date: Wed May 30 17:01:37 2012
New Revision: 1344348

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

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=1344348&r1=1344347&r2=1344348&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 17:01:37 2012
@@ -210,7 +210,8 @@ class ActiveMasterManager extends ZooKee
         return cleanSetOfActiveMaster;
       }
       // Try to become active master again now that there is no active master
-      blockUntilBecomingActiveMaster(startupStatus,clusterStatusTracker);
+      cleanSetOfActiveMaster = blockUntilBecomingActiveMaster(startupStatus,
+          clusterStatusTracker);
     }
     return cleanSetOfActiveMaster;
   }