You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/06/17 05:01:50 UTC
[08/30] hbase git commit: HBASE-15746 Remove extra RegionCoprocessor
preClose() in RSRpcServices#closeRegion (Stephen Yuan Jiang)
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/df240043
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/df240043
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/df240043
Branch: refs/heads/hbase-12439
Commit: df2400435340fe4d81cc199a4fd7827fc7467fe2
Parents: 17bcf14
Author: Stephen Yuan Jiang <sy...@gmail.com>
Authored: Tue Jun 14 13:30:41 2016 -0700
Committer: Stephen Yuan Jiang <sy...@gmail.com>
Committed: Tue Jun 14 13:30:41 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/df240043/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 396e182..b97c23f 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);
http://git-wip-us.apache.org/repos/asf/hbase/blob/df240043/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 e09e0e3..f45fc69 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);