hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-14885 NullPointerException in HMaster#normalizeRegions() due to missing TableDescriptor
Date Thu, 26 Nov 2015 00:08:59 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 30604761c -> 06c233834


HBASE-14885 NullPointerException in HMaster#normalizeRegions() due to missing TableDescriptor


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/06c23383
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/06c23383
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/06c23383

Branch: refs/heads/branch-1
Commit: 06c233834f1d0e2fac3659d3d243641cabf72961
Parents: 3060476
Author: tedyu <yuzhihong@gmail.com>
Authored: Wed Nov 25 16:08:49 2015 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Wed Nov 25 16:08:49 2015 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/06c23383/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index c1f10fb..619440e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1356,7 +1356,8 @@ public class HMaster extends HRegionServer implements MasterServices,
Server {
           LOG.debug("Skipping normalizing " + table + " since its namespace has quota");
           continue;
         }
-        if (table.isSystemTable() || !getTableDescriptors().get(table).isNormalizationEnabled())
{
+        if (table.isSystemTable() || (getTableDescriptors().get(table) != null &&
+          !getTableDescriptors().get(table).isNormalizationEnabled())) {
           LOG.debug("Skipping normalization for table: " + table + ", as it's either system"
             + " table or doesn't have auto normalization turned on");
           continue;


Mime
View raw message