diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index a40b71f..b59a7d8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -95,6 +95,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.test.MetricsAssertHelper; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper; +import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.IncrementingEnvironmentEdge; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.PairOfSameType; @@ -422,7 +423,8 @@ public class TestHRegion extends HBaseTestCase { //now find the compacted file, and manually add it to the recovered edits Path tmpDir = region.getRegionFileSystem().getTempDir(); - FileStatus[] files = region.getRegionFileSystem().getFileSystem().listStatus(tmpDir); + FileStatus[] files = FSUtils.listStatus(fs, tmpDir); + assertNotNull(files); assertEquals(1, files.length); //move the file inside region dir Path newFile = region.getRegionFileSystem().commitStoreFile(Bytes.toString(family), files[0].getPath()); @@ -459,8 +461,8 @@ public class TestHRegion extends HBaseTestCase { LOG.info(sf.getPath()); } assertEquals(1, region.getStore(family).getStorefilesCount()); - files = region.getRegionFileSystem().getFileSystem().listStatus(tmpDir); - assertEquals(0, files.length); + files = FSUtils.listStatus(fs, tmpDir); + assertTrue(files == null || files.length == 0); for (long i = minSeqId; i < maxSeqId; i++) { Get get = new Get(Bytes.toBytes(i)); @@ -473,7 +475,7 @@ public class TestHRegion extends HBaseTestCase { this.region = null; } } - + public void testGetWhileRegionClose() throws IOException { Configuration hc = initSplit(); int numRows = 100;