You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/10/03 01:15:51 UTC
svn commit: r1393235 - in /hbase/branches/0.94: bin/region_mover.rb
src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
Author: stack
Date: Tue Oct 2 23:15:51 2012
New Revision: 1393235
URL: http://svn.apache.org/viewvc?rev=1393235&view=rev
Log:
HBASE-6927 WrongFS using HRegionInfo.getTableDesc() and different fs for hbase.root and fs.defaultFS
Modified:
hbase/branches/0.94/bin/region_mover.rb
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
Modified: hbase/branches/0.94/bin/region_mover.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/bin/region_mover.rb?rev=1393235&r1=1393234&r2=1393235&view=diff
==============================================================================
--- hbase/branches/0.94/bin/region_mover.rb (original)
+++ hbase/branches/0.94/bin/region_mover.rb Tue Oct 2 23:15:51 2012
@@ -129,7 +129,7 @@ def isSuccessfulScan(admin, r)
scan.setBatch(1)
scan.setCaching(1)
scan.setFilter(FirstKeyOnlyFilter.new())
- table = getTable(admin.getConfiguration(), r.getTableDesc().getName())
+ table = getTable(admin.getConfiguration(), r.getTableName())
scanner = table.getScanner(scan)
begin
results = scanner.next()
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java?rev=1393235&r1=1393234&r2=1393235&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java Tue Oct 2 23:15:51 2012
@@ -554,6 +554,8 @@ implements WritableComparable<HRegionInf
@Deprecated
public HTableDescriptor getTableDesc() {
Configuration c = HBaseConfiguration.create();
+ c.set("fs.defaultFS", c.get(HConstants.HBASE_DIR));
+ c.set("fs.default.name", c.get(HConstants.HBASE_DIR));
FileSystem fs;
try {
fs = FileSystem.get(c);