You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/05/03 07:34:02 UTC
[hbase] branch branch-2.1 updated: HBASE-22354 master never sets
abortRequested, and thus abort timeout doesn't work for it
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 7269aa37 HBASE-22354 master never sets abortRequested, and thus abort timeout doesn't work for it
7269aa37 is described below
commit 7269aa3743cefe0485060d0c8e600e3b2527efd8
Author: Sergey Shelukhin <se...@apache.org>
AuthorDate: Thu May 2 18:08:02 2019 -0700
HBASE-22354 master never sets abortRequested, and thus abort timeout doesn't work for it
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 1 +
.../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 6 +++++-
2 files changed, 6 insertions(+), 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
index 41d25b9..99e677b 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
@@ -2850,6 +2850,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 7fb2c89..36e0977 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
@@ -2377,7 +2377,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.
@@ -2410,6 +2410,10 @@ public class HRegionServer extends HasThread implements
stop(reason, true, null);
}
+ protected final void setAbortRequested() {
+ this.abortRequested = true;
+ }
+
/**
* @see HRegionServer#abort(String, Throwable)
*/