Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 28aaa49c6 -> 25ec2f3e4


HBASE-16830 RSRpcServices#openRegion() should handle the case where table 
descriptor is null


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

Branch: refs/heads/branch-1.3
Commit: 25ec2f3e4f554bf55642f78552503ca8e3a577d9
Parents: 28aaa49
Author: tedyu <yuzhih...@gmail.com>
Authored: Thu Oct 13 18:57:09 2016 -0700
Committer: tedyu <yuzhih...@gmail.com>
Committed: Thu Oct 13 18:57:09 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/25ec2f3e/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 e5caefd..5b8155e 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
@@ -1673,7 +1673,8 @@ public class RSRpcServices implements 
HBaseRPCErrorHandler,
           } else {
             
regionServer.updateRegionFavoredNodesMapping(region.getEncodedName(),
               regionOpenInfo.getFavoredNodesList());
-            if (htd.getPriority() >= HConstants.ADMIN_QOS || 
region.getTable().isSystemTable()) {
+            if ((htd != null && htd.getPriority() >= HConstants.ADMIN_QOS) ||
+                (region.getTable() != null && 
region.getTable().isSystemTable())) {
               regionServer.service.submit(new OpenPriorityRegionHandler(
                 regionServer, regionServer, region, htd, masterSystemTime, 
coordination, ord));
             } else {

Reply via email to