Repository: hbase Updated Branches: refs/heads/branch-1.1 3b925fc3f -> a0b836e54
HBASE-15746 Remove extra RegionCoprocessor preClose() in RSRpcServices#closeRegion (Stephen Yuan Jiang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a0b836e5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a0b836e5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a0b836e5 Branch: refs/heads/branch-1.1 Commit: a0b836e54a429095a6132a9ca2cf965c768031d6 Parents: 3b925fc Author: Stephen Yuan Jiang <syuanjiang...@gmail.com> Authored: Tue Jun 14 13:30:41 2016 -0700 Committer: Stephen Yuan Jiang <syuanjiang...@gmail.com> Committed: Tue Jun 14 13:40:22 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 1 + .../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a0b836e5/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 bea4283..73a7c4e 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 @@ -2759,6 +2759,7 @@ public class HRegionServer extends HasThread implements throws NotServingRegionException, RegionAlreadyInTransitionException { //Check for permissions to close. Region actualRegion = this.getFromOnlineRegions(encodedName); + // Can be null if we're calling close on a region that's not online if ((actualRegion != null) && (actualRegion.getCoprocessorHost() != null)) { try { actualRegion.getCoprocessorHost().preClose(false); http://git-wip-us.apache.org/repos/asf/hbase/blob/a0b836e5/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 b4158d1..295d095 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 @@ -1085,12 +1085,6 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } final String encodedRegionName = ProtobufUtil.getRegionEncodedName(request.getRegion()); - // Can be null if we're calling close on a region that's not online - final Region region = regionServer.getFromOnlineRegions(encodedRegionName); - if ((region != null) && (region .getCoprocessorHost() != null)) { - region.getCoprocessorHost().preClose(false); - } - requestCount.increment(); LOG.info("Close " + encodedRegionName + ", moving to " + sn); CloseRegionCoordination.CloseRegionDetails crd = regionServer.getCoordinatedStateManager()
