You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/08/28 14:24:16 UTC
[hbase] branch master updated: HBASE-26216 Move
HRegionServer.abort(String) to Abortable as a default method (#3642)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 0098164 HBASE-26216 Move HRegionServer.abort(String) to Abortable as a default method (#3642)
0098164 is described below
commit 00981643d2fd1b393bd23d9eb43227a4e42d1000
Author: GeorryHuang <21...@qq.com>
AuthorDate: Sat Aug 28 22:23:23 2021 +0800
HBASE-26216 Move HRegionServer.abort(String) to Abortable as a default method (#3642)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/Abortable.java | 10 ++++++++++
.../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 7 -------
2 files changed, 10 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 8233071..b137a7d 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
@@ -38,6 +38,16 @@ 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);
+ }
+
+ /**
* 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 89fea39..13379a0 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 @@ public class HRegionServer extends Thread implements RegionServerServices, LastS
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();