You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/07/17 15:27:32 UTC
hbase git commit: HBASE-14109 NPE if we don't load fully before we
are shutdown
Repository: hbase
Updated Branches:
refs/heads/branch-1 d4a04d621 -> d887e4cf1
HBASE-14109 NPE if we don't load fully before we are shutdown
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d887e4cf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d887e4cf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d887e4cf
Branch: refs/heads/branch-1
Commit: d887e4cf1a5a82ac9a29f95519256b1390167a59
Parents: d4a04d6
Author: stack <st...@apache.org>
Authored: Fri Jul 17 06:27:06 2015 -0700
Committer: stack <st...@apache.org>
Committed: Fri Jul 17 06:27:14 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java | 2 +-
.../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d887e4cf/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
index 01e9a37..b7403ec 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/hbase/blob/d887e4cf/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
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 04c443f..9962135 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
@@ -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();