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 4d32480881..faa5c7dd56 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 @@ -2955,6 +2955,7 @@ public class HMaster extends HRegionServer implements MasterServices { if (isAborted() || isStopped()) { return; } + setAbortRequested(); if (cpHost != null) { // HBASE-4014: dump a list of loaded coprocessors. LOG.error(HBaseMarkers.FATAL, "Master server abort: loaded coprocessors are: " + diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index bcbc78b27b..68652aff47 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -2418,7 +2418,7 @@ public class HRegionServer extends HasThread implements } else { LOG.error(HBaseMarkers.FATAL, msg); } - this.abortRequested = true; + setAbortRequested(); // HBASE-4014: show list of coprocessors that were loaded to help debug // regionserver crashes.Note that we're implicitly using // java.util.HashSet's toString() method to print the coprocessor names. @@ -2452,6 +2452,10 @@ public class HRegionServer extends HasThread implements stop(reason, true, null); } + protected final void setAbortRequested() { + this.abortRequested = true; + } + /** * @see HRegionServer#abort(String, Throwable) */