You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/01/14 01:53:52 UTC
hbase git commit: HBASE-17464 Fix
HBaseTestingUtility.getNewDataTestDirOnTestFS to always return a unique path
Repository: hbase
Updated Branches:
refs/heads/branch-1 ee66ab8e2 -> 354e21385
HBASE-17464 Fix HBaseTestingUtility.getNewDataTestDirOnTestFS to always return a unique path
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/354e2138
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/354e2138
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/354e2138
Branch: refs/heads/branch-1
Commit: 354e213852efe9def24e25ec76c2a4472e8a1944
Parents: ee66ab8
Author: Michael Stack <st...@apache.org>
Authored: Fri Jan 13 17:52:24 2017 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Fri Jan 13 17:53:48 2017 -0800
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/354e2138/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 99e8741..f3becfe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -535,13 +535,13 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
//the working directory, and create a unique sub dir there
FileSystem fs = getTestFileSystem();
Path newDataTestDir = null;
+ String randomStr = UUID.randomUUID().toString();
if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {
- File dataTestDir = new File(getDataTestDir().toString());
+ newDataTestDir = new Path(getDataTestDir(), randomStr);
+ File dataTestDir = new File(newDataTestDir.toString());
if (deleteOnExit()) dataTestDir.deleteOnExit();
- newDataTestDir = new Path(dataTestDir.getAbsolutePath());
} else {
Path base = getBaseTestDirOnTestFS();
- String randomStr = UUID.randomUUID().toString();
newDataTestDir = new Path(base, randomStr);
if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);
}