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) {