From addf2a8315baf9b5ef07a2576b4ee4e1eb4a3cc8 Mon Sep 17 00:00:00 2001
From: GeorryHuang <215175212@qq.com>
Date: Sat, 28 Aug 2021 08:43:08 +0800
Subject: [PATCH 1/2] HBASE-26216 Move HRegionServer.abort(String) to Abortable
 as a default method

---
 .../src/main/java/org/apache/hadoop/hbase/Abortable.java   | 4 ++++
 .../apache/hadoop/hbase/regionserver/HRegionServer.java    | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java
index 8233071bc3fd..4b999983a4ea 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java
@@ -37,6 +37,10 @@ public interface Abortable {
    */
   void abort(String why, Throwable e);
 
+  default void abort(String why) {
+    abort(why, null);
+  }
+
   /**
    * Check if the server or client was aborted.
    * @return true if the server or client was aborted, false otherwise
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 89fea39fc087..13379a0deed1 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
@@ -2636,13 +2636,6 @@ protected boolean setAbortRequested() {
     return abortRequested.compareAndSet(false, true);
   }
 
-  /**
-   * @see HRegionServer#abort(String, Throwable)
-   */
-  public void abort(String reason) {
-    abort(reason, null);
-  }
-
   @Override
   public boolean isAborted() {
     return abortRequested.get();

From ba7a9e23f60516436a30090a89c2143e3e69934c Mon Sep 17 00:00:00 2001
From: GeorryHuang <215175212@qq.com>
Date: Sat, 28 Aug 2021 11:03:59 +0800
Subject: [PATCH 2/2] add javadoc

---
 .../src/main/java/org/apache/hadoop/hbase/Abortable.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java
index 4b999983a4ea..b137a7da2ceb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/Abortable.java
@@ -37,6 +37,12 @@ public interface Abortable {
    */
   void abort(String why, Throwable e);
 
+  /**
+   * It just call another abort method and the Throwable
+   * parameter is null.
+   * @param why Why we're aborting.
+   * @see Abortable#abort(String, Throwable)
+   */
   default void abort(String why) {
     abort(why, null);
   }