Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1522032) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -1708,7 +1708,10 @@ 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."); Index: src/main/resources/hbase-default.xml =================================================================== --- src/main/resources/hbase-default.xml (revision 1522032) +++ src/main/resources/hbase-default.xml (working copy) @@ -273,6 +273,12 @@ + fail.fast.expired.active.master + false + If abort immediately for the expired master without trying + to recover its zk session. + + hbase.master.dns.interface default The name of the Network Interface from which a master