Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22360 Abort timer doesn't set when abort is called during graceful shutdown process 

Signed-off-by: Sergey Shelukhin <sershe@apache.org>
This commit is contained in:
Bahram Chehrazy 2019-05-07 15:48:59 -07:00 committed by Sergey Shelukhin
parent b5b89f7c74
commit d9491c0b65
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -537,6 +537,9 @@ public class HRegionServer extends HasThread implements
/**regionserver codec list **/ /**regionserver codec list **/
public static final String REGIONSERVER_CODEC = "hbase.regionserver.codecs"; public static final String REGIONSERVER_CODEC = "hbase.regionserver.codecs";
// A timer to shutdown the process if abort takes too long
private Timer abortMonitor;
/** /**
* Starts a HRegionServer at the default location * Starts a HRegionServer at the default location
*/ */
@ -1047,21 +1050,6 @@ public class HRegionServer extends HasThread implements
} }
} }
if (abortRequested) {
Timer abortMonitor = new Timer("Abort regionserver monitor", true);
TimerTask abortTimeoutTask = null;
try {
abortTimeoutTask =
Class.forName(conf.get(ABORT_TIMEOUT_TASK, SystemExitWhenAbortTimeout.class.getName()))
.asSubclass(TimerTask.class).getDeclaredConstructor().newInstance();
} catch (Exception e) {
LOG.warn("Initialize abort timeout task failed", e);
}
if (abortTimeoutTask != null) {
abortMonitor.schedule(abortTimeoutTask, conf.getLong(ABORT_TIMEOUT, DEFAULT_ABORT_TIMEOUT));
}
}
if (this.leases != null) { if (this.leases != null) {
this.leases.closeAfterLeasesExpire(); this.leases.closeAfterLeasesExpire();
} }
@ -2448,6 +2436,8 @@ public class HRegionServer extends HasThread implements
} catch (Throwable t) { } catch (Throwable t) {
LOG.warn("Unable to report fatal error to master", t); LOG.warn("Unable to report fatal error to master", t);
} }
scheduleAbortTimer();
// shutdown should be run as the internal user // shutdown should be run as the internal user
stop(reason, true, null); stop(reason, true, null);
} }
@ -2485,6 +2475,24 @@ public class HRegionServer extends HasThread implements
protected void sendShutdownInterrupt() { protected void sendShutdownInterrupt() {
} }
// Limits the time spent in the shutdown process.
private void scheduleAbortTimer() {
if (this.abortMonitor == null) {
this.abortMonitor = new Timer("Abort regionserver monitor", true);
TimerTask abortTimeoutTask = null;
try {
abortTimeoutTask =
Class.forName(conf.get(ABORT_TIMEOUT_TASK, SystemExitWhenAbortTimeout.class.getName()))
.asSubclass(TimerTask.class).getDeclaredConstructor().newInstance();
} catch (Exception e) {
LOG.warn("Initialize abort timeout task failed", e);
}
if (abortTimeoutTask != null) {
abortMonitor.schedule(abortTimeoutTask, conf.getLong(ABORT_TIMEOUT, DEFAULT_ABORT_TIMEOUT));
}
}
}
/** /**
* Wait on all threads to finish. Presumption is that all closes and stops * Wait on all threads to finish. Presumption is that all closes and stops
* have already been called. * have already been called.