Author: stack
Date: Fri May 14 05:30:02 2010
New Revision: 944115
URL: http://svn.apache.org/viewvc?rev=944115&view=rev
Log:
HBASE-2546 Specify default filesystem in both the new and old way (needed if we
are to run on 0.20 and 0.21 hadoop)
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=944115&r1=944114&r2=944115&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri May 14 05:30:02 2010
@@ -309,6 +309,8 @@ Release 0.21.0 - Unreleased
getting permanently offlined
HBASE-2515 ChangeTableState considers split&&offline regions as being
served
HBASE-2544 Forward port branch 0.20 WAL to TRUNK
+ HBASE-2546 Specify default filesystem in both the new and old way (needed
+ if we are to run on 0.20 and 0.21 hadoop)
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified:
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=944115&r1=944114&r2=944115&view=diff
==============================================================================
---
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Fri May 14 05:30:02 2010
@@ -165,6 +165,9 @@ public class HMaster extends Thread impl
// default localfs. Presumption is that rootdir is fully-qualified before
// we get to here with appropriate fs scheme.
this.rootdir = FSUtils.getRootDir(this.conf);
+ // 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.
+ this.conf.set("fs.default.name", this.rootdir.toString());
this.conf.set("fs.defaultFS", this.rootdir.toString());
this.fs = FileSystem.get(this.conf);
checkRootDir(this.rootdir, this.conf, this.fs);
