hbase-commits mailing list archives

Repository: hbase
Updated Branches:
  refs/heads/branch-1 00f6af2e8 -> b1c60940d


HBASE-16359 Addendum fixes TestZKBasedOpenCloseRegion


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

Branch: refs/heads/branch-1
Commit: b1c60940da7035ce1473a11fb5aa0abdccb8d382
Parents: 00f6af2
Author: tedyu <yuzhihong@gmail.com>
Authored: Fri Aug 5 10:54:20 2016 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Fri Aug 5 10:54:20 2016 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/regionserver/RSRpcServices.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b1c60940/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 0daff17..5c19eae 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
@@ -1599,6 +1599,11 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
           }
         }
         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(
           region.getEncodedNameAsBytes(), Boolean.TRUE);
@@ -1641,11 +1646,6 @@ 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());
           }