Fix NPE in CJ
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7e9c84a5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7e9c84a5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7e9c84a5 Branch: refs/heads/HBASE-14614 Commit: 7e9c84a5be9c42c380314e7dfc7394097a0a4177 Parents: 37a9ab6 Author: Michael Stack <st...@apache.org> Authored: Wed May 17 09:43:07 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Tue May 23 08:36:54 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7e9c84a5/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index 7d43f2f..dc0c0a6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java @@ -346,9 +346,12 @@ public class CatalogJanitor extends ScheduledChore { Pair<Boolean, Boolean> a = checkDaughterInFs(parent, daughters.getFirst()); Pair<Boolean, Boolean> b = checkDaughterInFs(parent, daughters.getSecond()); if (hasNoReferences(a) && hasNoReferences(b)) { + String daughterA = daughters.getFirst() != null? + daughters.getFirst().getShortNameToLog(): "null"; + String daughterB = daughters.getSecond() != null? + daughters.getSecond().getShortNameToLog(): "null"; LOG.debug("Deleting region " + parent.getShortNameToLog() + - " because daughters -- " + daughters.getFirst().getShortNameToLog() + ", " + - daughters.getSecond().getShortNameToLog() + + " because daughters -- " + daughterA + ", " + daughterB + " -- no longer hold references"); ProcedureExecutor<MasterProcedureEnv> pe = this.services.getMasterProcedureExecutor(); pe.submitProcedure(new GCRegionProcedure(pe.getEnvironment(), parent));
