Index: src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (revision 1100040) +++ src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (working copy) @@ -19,28 +19,34 @@ */ package org.apache.hadoop.hbase.util; -import static org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.*; -import org.apache.hadoop.hbase.client.*; -import org.apache.hadoop.hbase.ipc.HRegionInterface; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.HServerAddress; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.ResultScanner; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE; import org.junit.BeforeClass; import org.junit.Test; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - public class TestHBaseFsck { final Log LOG = LogFactory.getLog(getClass()); @@ -142,8 +148,10 @@ HTable tbl = TEST_UTIL.createTable(Bytes.toBytes("table2"), FAM); - HRegionInfo hriOrig = tbl.getRegionsInfo().keySet().iterator().next(); - HServerAddress rsAddressOrig = tbl.getRegionsInfo().get(hriOrig); + Map hris = tbl.getRegionsInfo(); + HRegionInfo hriOrig = hris.keySet().iterator().next(); + Map locations = tbl.getRegionLocations(); + ServerName rsAddressOrig = locations.get(hriOrig); byte[][] startKeys = new byte[][]{ HConstants.EMPTY_BYTE_ARRAY, Index: src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java (revision 1100040) +++ src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java (working copy) @@ -25,7 +25,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ZooKeeperConnectionException; @@ -104,8 +103,8 @@ HConnection connection = HConnectionManager.getConnection(conf); boolean success = false; try { - HRegionInterface rs = connection.getHRegionConnection(new HServerAddress( - server.getHostname(), server.getPort())); + HRegionInterface rs = + connection.getHRegionConnection(server.getHostname(), server.getPort()); rs.closeRegion(region, false); long timeout = conf.getLong("hbase.hbck.close.timeout", 120000); long expiration = timeout + System.currentTimeMillis(); Index: src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java (revision 1100040) +++ src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java (working copy) @@ -311,7 +311,7 @@ return true; } }; - metaScan(conf, visitor); + metaScan(conf, visitor, tablename); return regions; }