You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ch...@apache.org on 2016/03/25 05:07:41 UTC
hbase git commit: HBASE-15384 Avoid using '/tmp' directory in
TestBulkLoad
Repository: hbase
Updated Branches:
refs/heads/master 07c597c8a -> e9c4f1285
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/e9c4f128
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e9c4f128
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e9c4f128
Branch: refs/heads/master
Commit: e9c4f12856420b3089665751ea141298580f6c21
Parents: 07c597c
Author: chenheng <ch...@apache.org>
Authored: Thu Mar 24 15:19:02 2016 +0800
Committer: chenheng <ch...@apache.org>
Committed: Fri Mar 25 12:06:55 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/e9c4f128/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 d0633a8..6ba12a9 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();
@@ -217,13 +219,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());
}