hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1393234 - in /hbase/trunk: bin/region_mover.rb hbase-server/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
Date Tue, 02 Oct 2012 23:13:59 GMT
Author: stack
Date: Tue Oct  2 23:13:58 2012
New Revision: 1393234

URL: http://svn.apache.org/viewvc?rev=1393234&view=rev
Log:
HBASE-6927 WrongFS using HRegionInfo.getTableDesc() and different fs for hbase.root and fs.defaultFS

Modified:
    hbase/trunk/bin/region_mover.rb
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java

Modified: hbase/trunk/bin/region_mover.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/region_mover.rb?rev=1393234&r1=1393233&r2=1393234&view=diff
==============================================================================
--- hbase/trunk/bin/region_mover.rb (original)
+++ hbase/trunk/bin/region_mover.rb Tue Oct  2 23:13:58 2012
@@ -128,7 +128,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/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java?rev=1393234&r1=1393233&r2=1393234&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java Tue Oct
 2 23:13:58 2012
@@ -570,6 +570,8 @@ public class HRegionInfo implements Comp
    @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);



Mime
View raw message