From df2400435340fe4d81cc199a4fd7827fc7467fe2 Mon Sep 17 00:00:00 2001 From: Stephen Yuan Jiang Date: Tue, 14 Jun 2016 13:30:41 -0700 Subject: [PATCH] HBASE-15746 Remove extra RegionCoprocessor preClose() in RSRpcServices#closeRegion (Stephen Yuan Jiang) --- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 1 + .../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) 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 396e1829547..b97c23f6641 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 @@ -2845,6 +2845,7 @@ public class HRegionServer extends HasThread implements throws NotServingRegionException { //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); 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 e09e0e3cab5..f45fc6934c6 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 @@ -1324,12 +1324,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); boolean closed = regionServer.closeRegion(encodedRegionName, false, sn);