You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/05/17 18:27:47 UTC

svn commit: r1339689 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java

Author: tedyu
Date: Thu May 17 16:27:46 2012
New Revision: 1339689

URL: http://svn.apache.org/viewvc?rev=1339689&view=rev
Log:
HBASE-6029 HBCK doesn't recover Balance switch if exception occurs in onlineHbck() (Maryann)

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1339689&r1=1339688&r2=1339689&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java Thu May 17 16:27:46 2012
@@ -383,10 +383,12 @@ public class HBaseFsck {
 
     // turn the balancer off
     boolean oldBalancer = admin.balanceSwitch(false);
-
-    onlineConsistencyRepair();
-
-    admin.balanceSwitch(oldBalancer);
+    try {
+      onlineConsistencyRepair();
+    }
+    finally {
+      admin.balanceSwitch(oldBalancer);
+    }
 
     // Print table summary
     printTableSummary(tablesInfo);