HBASE-16359 Addendum moves null checking as suggested by Heng
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4b3e45fc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4b3e45fc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4b3e45fc Branch: refs/heads/hbase-12439 Commit: 4b3e45fceb0d65093f6ca5d821eb1f2cb26398df Parents: e8f08ba Author: tedyu <yuzhih...@gmail.com> Authored: Fri Aug 5 03:18:28 2016 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Fri Aug 5 03:18:28 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/RSRpcServices.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4b3e45fc/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index 0de4a28..d87ada4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -1684,11 +1684,6 @@ public class RSRpcServices implements HBaseRPCErrorHandler, throw new IOException(error); } LOG.info("Open " + region.getRegionNameAsString()); - htd = htds.get(region.getTable()); - if (htd == null) { - htd = regionServer.tableDescriptors.get(region.getTable()); - htds.put(region.getTable(), htd); - } final Boolean previous = regionServer.regionsInTransitionInRS.putIfAbsent( encodedNameBytes, Boolean.TRUE); @@ -1733,6 +1728,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, tmpRegions); } } + htd = htds.get(region.getTable()); + if (htd == null) { + htd = regionServer.tableDescriptors.get(region.getTable()); + htds.put(region.getTable(), htd); + } + if (htd == null) { + throw new IOException("Missing table descriptor for " + region.getEncodedName()); + } // If there is no action in progress, we can submit a specific handler. // Need to pass the expected version in the constructor. if (region.isMetaRegion()) { @@ -1741,9 +1744,6 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } else { regionServer.updateRegionFavoredNodesMapping(region.getEncodedName(), regionOpenInfo.getFavoredNodesList()); - if (htd == null) { - throw new IOException("Missing table descriptor for " + region.getEncodedName()); - } if (htd.getPriority() >= HConstants.ADMIN_QOS || region.getTable().isSystemTable()) { regionServer.service.submit(new OpenPriorityRegionHandler( regionServer, regionServer, region, htd, masterSystemTime));
