Repository: hbase Updated Branches: refs/heads/branch-1.2 6a80087f4 -> c33e2352f
HBASE-15384 Avoid using '/tmp' directory in TestBulkLoad Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c33e2352 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c33e2352 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c33e2352 Branch: refs/heads/branch-1.2 Commit: c33e2352f688e23c665216a6fa8ae99c0d284134 Parents: 6a80087 Author: chenheng <[email protected]> Authored: Thu Mar 24 15:19:02 2016 +0800 Committer: chenheng <[email protected]> Committed: Tue Mar 29 11:13:34 2016 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/TestBulkLoad.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c33e2352/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java index 092f3ef..735fec8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java @@ -38,6 +38,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; @@ -81,6 +82,7 @@ public class TestBulkLoad { @ClassRule public static TemporaryFolder testFolder = new TemporaryFolder(); + private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final WAL log = mock(WAL.class); private final Configuration conf = HBaseConfiguration.create(); private final Random random = new Random(); @@ -216,13 +218,18 @@ public class TestBulkLoad { } private Pair<byte[], String> withMissingHFileForFamily(byte[] family) { - return new Pair<byte[], String>(family, "/tmp/does_not_exist"); + return new Pair<byte[], String>(family, getNotExistFilePath()); + } + + private String getNotExistFilePath() { + Path path = new Path(TEST_UTIL.getDataTestDir(), "does_not_exist"); + return path.toUri().getPath(); } private Pair<byte[], String> withInvalidColumnFamilyButProperHFileLocation(byte[] family) throws IOException { createHFileForFamilies(family); - return new Pair<byte[], String>(new byte[]{0x00, 0x01, 0x02}, "/tmp/does_not_exist"); + return new Pair<byte[], String>(new byte[]{0x00, 0x01, 0x02}, getNotExistFilePath()); }
