Repository: hbase Updated Branches: refs/heads/branch-1.1 ba2709170 -> cd4668b3e
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/cd4668b3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cd4668b3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cd4668b3 Branch: refs/heads/branch-1.1 Commit: cd4668b3eb9e3718436141f3869df34e484d60c7 Parents: ba27091 Author: stack <[email protected]> Authored: Fri Jul 17 06:27:06 2015 -0700 Committer: stack <[email protected]> Committed: Fri Jul 17 06:29:07 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/cd4668b3/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 6e87997..d615429 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 @@ -416,7 +416,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/cd4668b3/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 5ffa6cd..363e11f 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 @@ -908,7 +908,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();
