svn commit: r1310627 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java

[jm...@apache.org]

Author: jmhsieh
Date: Fri Apr  6 22:42:04 2012
New Revision: 1310627

URL: http://svn.apache.org/viewvc?rev=1310627&view=rev
Log:
HBASE-5734 Change hbck sideline root (Jimmy Xiang)

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1310627&r1=1310626&r2=1310627&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Apr  6 22:42:04 2012
@@ -35,6 +35,7 @@ Release 0.92.2 - Unreleased
    HBASE-5589  Add of the offline call to the Master Interface
    HBASE-5436  Right-size the map when reading attributes (Benoit)
    HBASE-5533  Add more metrics to HBase (Shaneal Manek)
+   HBASE-5734  Change hbck sideline root (Jimmy Xiang)
 
   NEW FEATURE
    HBASE-5128  [uber hbck] Online automated repair of table integrity and region consistency problems

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1310627&r1=1310626&r2=1310627&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java Fri Apr  6 22:42:04 2012
@@ -819,7 +819,8 @@ public class HBaseFsck {
 
   private Path getSidelineDir() throws IOException {
     Path hbaseDir = FSUtils.getRootDir(conf);
-    Path backupDir = new Path(hbaseDir.getParent(), hbaseDir.getName() + "-"
+    Path hbckDir = new Path(hbaseDir.getParent(), "hbck");
+    Path backupDir = new Path(hbckDir, hbaseDir.getName() + "-"
         + startMillis);
     return backupDir;
   }