You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2013/07/10 19:30:33 UTC
svn commit: r1501864 -
/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Author: jdcryans
Date: Wed Jul 10 17:30:33 2013
New Revision: 1501864
URL: http://svn.apache.org/r1501864
Log:
HBASE-8910 HMaster.abortNow shouldn't try to become a master again if it was stopped
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1501864&r1=1501863&r2=1501864&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Wed Jul 10 17:30:33 2013
@@ -2147,7 +2147,7 @@ MasterServices, Server {
* @return true if we should proceed with abort operation, false other wise.
*/
private boolean abortNow(final String msg, final Throwable t) {
- if (!this.isActiveMaster) {
+ if (!this.isActiveMaster || this.stopped) {
return true;
}
if (t != null && t instanceof KeeperException.SessionExpiredException) {