hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1521949 - in /hbase/trunk: hbase-common/src/main/resources/hbase-default.xml hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Date Wed, 11 Sep 2013 17:43:44 GMT
Author: stack
Date: Wed Sep 11 17:43:43 2013
New Revision: 1521949

URL: http://svn.apache.org/r1521949
Log:
HBASE-9468 Previous active master can still serves RPC request when it is trying recovering
expired zk session

Modified:
    hbase/trunk/hbase-common/src/main/resources/hbase-default.xml
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: hbase/trunk/hbase-common/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/resources/hbase-default.xml?rev=1521949&r1=1521948&r2=1521949&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/hbase-common/src/main/resources/hbase-default.xml Wed Sep 11 17:43:43 2013
@@ -147,6 +147,12 @@ possible configurations would overwhelm 
     META.</description>
   </property>
   <property>
+    <name>fail.fast.expired.active.master</name>
+    <value>false</value>
+    <description>If abort immediately for the expired master without trying
+      to recover its zk session.</description>
+  </property>
+  <property>
     <name>hbase.master.dns.interface</name>
     <value>default</value>
     <description>The name of the Network Interface from which a master

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1521949&r1=1521948&r2=1521949&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Wed
Sep 11 17:43:43 2013
@@ -2347,7 +2347,10 @@ MasterServices, Server {
     if (!this.isActiveMaster || this.stopped) {
       return true;
     }
-    if (t != null && t instanceof KeeperException.SessionExpiredException) {
+
+    boolean failFast = conf.getBoolean("fail.fast.expired.active.master", false);
+    if (t != null && t instanceof KeeperException.SessionExpiredException
+        && !failFast) {
       try {
         LOG.info("Primary Master trying to recover from ZooKeeper session " +
             "expiry.");



Mime
View raw message