From 2f1ba4a7fab0af5c310fe58371ab954ac7a9fe68 Mon Sep 17 00:00:00 2001
From: Jean-Daniel Cryans <jdcryans@apache.org>
Date: Wed, 10 Jul 2013 17:30:41 +0000
Subject: [PATCH] HBASE-8910  HMaster.abortNow shouldn't try to become a master
 again if it was stopped

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1501865 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 8d12cfb6119..3ecd9374374 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -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) {