Skip to content

Commit 0c0d595

Browse files
committed
HBASE-22354 master never sets abortRequested, and thus abort timeout doesn't work for it
Signed-off-by: Peter Somogyi <[email protected]>
1 parent f91768f commit 0c0d595

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2955,6 +2955,7 @@ public void abort(String reason, Throwable cause) {
29552955
if (isAborted() || isStopped()) {
29562956
return;
29572957
}
2958+
setAbortRequested();
29582959
if (cpHost != null) {
29592960
// HBASE-4014: dump a list of loaded coprocessors.
29602961
LOG.error(HBaseMarkers.FATAL, "Master server abort: loaded coprocessors are: " +

‎hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2418,7 +2418,7 @@ public void abort(String reason, Throwable cause) {
24182418
} else {
24192419
LOG.error(HBaseMarkers.FATAL, msg);
24202420
}
2421-
this.abortRequested = true;
2421+
setAbortRequested();
24222422
// HBASE-4014: show list of coprocessors that were loaded to help debug
24232423
// regionserver crashes.Note that we're implicitly using
24242424
// java.util.HashSet's toString() method to print the coprocessor names.
@@ -2452,6 +2452,10 @@ public void abort(String reason, Throwable cause) {
24522452
stop(reason, true, null);
24532453
}
24542454

2455+
protected final void setAbortRequested() {
2456+
this.abortRequested = true;
2457+
}
2458+
24552459
/**
24562460
* @see HRegionServer#abort(String, Throwable)
24572461
*/

0 commit comments

Comments
 (0)