HBASE-22354 master never sets abortRequested, and thus abort timeout …

…doesn't work for it Signed-off-by: Peter Somogyi <psomogyi@apache.org>
apache · May 3, 2019 · 0c0d595 · 0c0d595
1 parent f91768f
commit 0c0d595
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -2955,6 +2955,7 @@ public void abort(String reason, Throwable cause) {
     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
@@ -2418,7 +2418,7 @@ public void abort(String reason, Throwable cause) {
     } 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 void abort(String reason, Throwable cause) {
     stop(reason, true, null);
   }
 
+  protected final void setAbortRequested() {
+    this.abortRequested = true;
+  }
+
   /**
    * @see HRegionServer#abort(String, Throwable)
    */