You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ji...@apache.org on 2008/02/14 19:49:07 UTC
svn commit: r627837 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/HRegionServer.java
src/java/org/apache/hadoop/hbase/master/HMaster.java src/java/overview.html
Author: jimk
Date: Thu Feb 14 10:49:00 2008
New Revision: 627837
URL: http://svn.apache.org/viewvc?rev=627837&view=rev
Log:
HBASE-446 Fully qualified hbase.rootdir doesn't work
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
hadoop/hbase/trunk/src/java/overview.html
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=627837&r1=627836&r2=627837&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Feb 14 10:49:00 2008
@@ -19,6 +19,7 @@
HBASE-426 hbase can't find remote filesystem
HBASE-437 Clear Command should use system.out (Edward Yoon via Stack)
HBASE-434, HBASE-435 TestTableIndex and TestTableMapReduce failed in Hudson builds
+ HBASE-446 Fully qualified hbase.rootdir doesn't work
IMPROVEMENTS
HBASE-415 Rewrite leases to use DelayedBlockingQueue instead of polling
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java?rev=627837&r1=627836&r2=627837&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java Thu Feb 14 10:49:00 2008
@@ -872,6 +872,12 @@
}
this.conf.set(key, value);
}
+ // Master sent us hbase.rootdir to use. Should be fully qualified
+ // path with file system specification included. Set 'fs.default.name'
+ // to match the filesystem on hbase.rootdir else underlying hadoop hdfs
+ // accessors will be going against wrong filesystem (unless all is set
+ // to defaults).
+ this.conf.set("fs.default.name", this.conf.get("hbase.rootdir"));
this.fs = FileSystem.get(this.conf);
this.rootDir = new Path(this.conf.get(HConstants.HBASE_DIR));
this.log = setupHLog();
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=627837&r1=627836&r2=627837&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java Thu Feb 14 10:49:00 2008
@@ -255,10 +255,12 @@
*/
public HMaster(Path rd, HServerAddress address, HBaseConfiguration conf)
throws IOException {
-
this.conf = conf;
+ this.rootdir = rd;
+ // The filesystem hbase wants to use is probably not what is set into
+ // fs.default.name; its value is probably the default.
+ this.conf.set("fs.default.name", this.rootdir.toString());
this.fs = FileSystem.get(conf);
- this.rootdir = this.fs.makeQualified(rd);
this.conf.set(HConstants.HBASE_DIR, this.rootdir.toString());
this.rand = new Random();
Path rootRegionDir =
Modified: hadoop/hbase/trunk/src/java/overview.html
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/overview.html?rev=627837&r1=627836&r2=627837&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/overview.html (original)
+++ hadoop/hbase/trunk/src/java/overview.html Thu Feb 14 10:49:00 2008
@@ -75,7 +75,7 @@
<property>
<name>hbase.master</name>
- <value>http://localhost:60000</value>
+ <value>localhost:60000</value>
<description>The host and port that the HBase master runs at.
</description>
</property>