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

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

This commit is contained in:
tedyu 2015-11-25 16:06:27 -08:00
parent efb5917f22
commit e73a9594c2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -69,6 +69,7 @@ import org.apache.hadoop.hbase.ProcedureInfo;
import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerLoad; import org.apache.hadoop.hbase.ServerLoad;
import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableDescriptor;
import org.apache.hadoop.hbase.TableDescriptors; import org.apache.hadoop.hbase.TableDescriptors;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotDisabledException; import org.apache.hadoop.hbase.TableNotDisabledException;
@ -1357,8 +1358,10 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
LOG.debug("Skipping normalizing " + table + " since its namespace has quota"); LOG.debug("Skipping normalizing " + table + " since its namespace has quota");
continue; continue;
} }
if (table.isSystemTable() || !getTableDescriptors().getDescriptor(table). TableDescriptor tblDesc = getTableDescriptors().getDescriptor(table);
getHTableDescriptor().isNormalizationEnabled()) { if (table.isSystemTable() || (tblDesc != null &&
tblDesc.getHTableDescriptor() != null &&
!tblDesc.getHTableDescriptor().isNormalizationEnabled())) {
LOG.debug("Skipping normalization for table: " + table + ", as it's either system" LOG.debug("Skipping normalization for table: " + table + ", as it's either system"
+ " table or doesn't have auto normalization turned on"); + " table or doesn't have auto normalization turned on");
continue; continue;