hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramkris...@apache.org
Subject svn commit: r1344798 - in /hbase/branches/0.94/src: main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java
Date Thu, 31 May 2012 16:19:48 GMT
Author: ramkrishna
Date: Thu May 31 16:19:48 2012
New Revision: 1344798

URL: http://svn.apache.org/viewvc?rev=1344798&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
    hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.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=1344798&r1=1344797&r2=1344798&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
Thu May 31 16:19:48 2012
@@ -210,7 +210,7 @@ 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;
   }

Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java?rev=1344798&r1=1344797&r2=1344798&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java
(original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestMasterZKSessionRecovery.java
Thu May 31 16:19:48 2012
@@ -63,8 +63,8 @@ public class TestMasterZKSessionRecovery
    * Negative test of master recovery from zk session expiry.
    * <p>
    * 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)
@@ -73,7 +73,7 @@ public class TestMasterZKSessionRecovery
     HMaster m = cluster.getMaster();
     m.abort("Test recovery from zk session expired",
       new KeeperException.SessionExpiredException());
-    assertTrue(m.isStopped());
+    assertFalse(m.isStopped());
   }
 
   /**



Mime
View raw message