You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2012/04/13 08:44:49 UTC
svn commit: r1325627 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java
Author: jmhsieh
Date: Fri Apr 13 06:44:49 2012
New Revision: 1325627
URL: http://svn.apache.org/viewvc?rev=1325627&view=rev
Log:
HBASE-5488 OfflineMetaRepair doesn't support hadoop 0.20's fs.default.name property (gaojinchao)
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1325627&r1=1325626&r2=1325627&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Apr 13 06:44:49 2012
@@ -37,6 +37,7 @@ Release 0.92.2 - Unreleased
contains trailing period if configured interface is not 'default'"
HBASE-5773 HtablePool constructor not reading config files in certain cases
(Ioan Eugen Stan)
+ HBASE-5488 OfflineMetaRepair doesn't support hadoop 0.20's fs.default.name property (gaojinchao)
IMPROVEMENTS
HBASE-5592 Make it easier to get a table from shell (Ben West)
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java?rev=1325627&r1=1325626&r2=1325627&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java Fri Apr 13 06:44:49 2012
@@ -62,7 +62,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);
boolean fixHoles = false;
@@ -77,6 +80,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 if (cmd.equals("-fixHoles")) {
fixHoles = true;
} else if (cmd.equals("-fix")) {