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

HBASE-14109 NPE if we don't load fully before we are shutdown

This commit is contained in:
stack 2015-07-17 06:27:06 -07:00
parent d4a04d6216
commit d887e4cf1a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
View File

@ -479,7 +479,7 @@ public class ProcedureExecutor<TEnvironment> {
}
// Initialize procedures timeout handler (this is the +1 thread)
threads[numThreads] = new Thread("ProcedureExecutorTimeoutThread") {
threads[numThreads] = new Thread("ProcedureExecutorTimeout") {
@Override
public void run() {
timeoutLoop();

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

@ -909,7 +909,9 @@ public class HRegionServer extends HasThread implements
}
// Start the Quota Manager
rsQuotaManager.start(getRpcServer().getScheduler());
if (this.rsQuotaManager != null) {
rsQuotaManager.start(getRpcServer().getScheduler());
}
// We registered with the Master. Go into run mode.
long lastMsg = System.currentTimeMillis();