Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@944115 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-05-14 05:30:02 +00:00
parent 635768d28a
commit 4e080fcbbb
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -309,6 +309,8 @@ Release 0.21.0 - Unreleased
getting permanently offlined getting permanently offlined
HBASE-2515 ChangeTableState considers split&&offline regions as being served HBASE-2515 ChangeTableState considers split&&offline regions as being served
HBASE-2544 Forward port branch 0.20 WAL to TRUNK 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 IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable HBASE-1760 Cleanup TODOs in HTable

3
core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -165,6 +165,9 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
// default localfs. Presumption is that rootdir is fully-qualified before // default localfs. Presumption is that rootdir is fully-qualified before
// we get to here with appropriate fs scheme. // we get to here with appropriate fs scheme.
this.rootdir = FSUtils.getRootDir(this.conf); 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.conf.set("fs.defaultFS", this.rootdir.toString());
this.fs = FileSystem.get(this.conf); this.fs = FileSystem.get(this.conf);
checkRootDir(this.rootdir, this.conf, this.fs); checkRootDir(this.rootdir, this.conf, this.fs);