Repository: hbase Updated Branches: refs/heads/master 3fdc6a2b7 -> 041a2ba94
HBASE-11611 Addendum to fix hanging tests Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/041a2ba9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/041a2ba9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/041a2ba9 Branch: refs/heads/master Commit: 041a2ba948e7aa04d814479b7ed81bc47ce14332 Parents: 3fdc6a2 Author: Jimmy Xiang <[email protected]> Authored: Thu Aug 7 09:00:42 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Thu Aug 7 09:00:42 2014 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/HRegionServer.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/041a2ba9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 46a1e51..24bb09a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1746,15 +1746,17 @@ public class HRegionServer extends HasThread implements // to handle the region transition report at all. if (code == TransitionCode.OPENED) { Preconditions.checkArgument(hris != null && hris.length == 1); - try { - MetaTableAccessor.updateRegionLocation(shortCircuitConnection, - hris[0], serverName, openSeqNum); - return true; - } catch (IOException e) { - LOG.info("Failed to update meta", e); - return false; + if (!hris[0].isMetaRegion()) { + try { + MetaTableAccessor.updateRegionLocation(shortCircuitConnection, + hris[0], serverName, openSeqNum); + } catch (IOException e) { + LOG.info("Failed to update meta", e); + return false; + } } } + return true; } ReportRegionStateTransitionRequest.Builder builder =
