You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/05/05 07:41:45 UTC
svn commit: r1479240 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java
Author: stack
Date: Sun May 5 05:41:44 2013
New Revision: 1479240
URL: http://svn.apache.org/r1479240
Log:
HBASE-5835 [hbck] Catch and handle NotServingRegionException when close region attempt fails
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java?rev=1479240&r1=1479239&r2=1479240&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java Sun May 5 05:41:44 2013
@@ -150,7 +150,11 @@ public class HBaseFsckRepair {
ServerName server, HRegionInfo region) throws IOException, InterruptedException {
HConnection connection = admin.getConnection();
AdminService.BlockingInterface rs = connection.getAdmin(server);
- ProtobufUtil.closeRegion(rs, region.getRegionName(), false);
+ try {
+ ProtobufUtil.closeRegion(rs, region.getRegionName(), false);
+ } catch (IOException e) {
+ LOG.warn("Exception when closing region: " + region.getRegionNameAsString(), e);
+ }
long timeout = admin.getConfiguration()
.getLong("hbase.hbck.close.timeout", 120000);
long expiration = timeout + System.currentTimeMillis();