svn commit: r1325628 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java

[jm...@apache.org]

Author: jmhsieh
Date: Fri Apr 13 06:44:53 2012
New Revision: 1325628

URL: http://svn.apache.org/viewvc?rev=1325628&view=rev
Log:
HBASE-5488 OfflineMetaRepair doesn't support hadoop 0.20's fs.default.name property (gaojinchao)

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1325628&r1=1325627&r2=1325628&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Apr 13 06:44:53 2012
@@ -15,6 +15,7 @@ Release 0.90.7 - Unreleased
    HBASE-5724  Row cache of KeyValue should be cleared in readFields().
                (Teruyoshi Zenmyo)
    HBASE-5680  Improve compatibility warning about HBase with Hadoop 0.23.x
+   HBASE-5488  OfflineMetaRepair doesn't support hadoop 0.20's fs.default.name property (gaojinchao)
 
   IMPROVEMENT
    HBASE-5588  Deprecate/remove AssignmentManager#clearRegionFromTransition

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java?rev=1325628&r1=1325627&r2=1325628&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java Fri Apr 13 06:44:53 2012
@@ -60,7 +60,10 @@ public class OfflineMetaRepair {
 
     // create a fsck object
     Configuration conf = HBaseConfiguration.create();
+    // Cover both bases, the old way of setting default fs and the new.
+    // We're supposed to run on 0.20 and 0.21 anyways.
     conf.set("fs.defaultFS", conf.get(HConstants.HBASE_DIR));
+    conf.set("fs.default.name", conf.get(HConstants.HBASE_DIR));
     HBaseFsck fsck = new HBaseFsck(conf);
 
     // Process command-line args.
@@ -74,6 +77,7 @@ public class OfflineMetaRepair {
         String path = args[i];
         conf.set(HConstants.HBASE_DIR, path);
         conf.set("fs.defaultFS", conf.get(HConstants.HBASE_DIR));
+        conf.set("fs.default.name", conf.get(HConstants.HBASE_DIR));
       } else {
         String str = "Unknown command line option : " + cmd;
         LOG.info(str);