From 5b51218a5637e954ec64b7ae6611f936de4a61ec Mon Sep 17 00:00:00 2001 From: stack Date: Wed, 17 Dec 2014 10:53:50 -0800 Subject: [PATCH] HBASE-12645 HBaseTestingUtility is using ${$HOME} for rootDir (Varun Saxena) -- ADDENDUM --- .../hadoop/hbase/HBaseTestingUtility.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 5a729657f20..a7ac01d0ad3 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 @@ -1086,7 +1086,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { } /** - * Returns the path to the default root dir the minicluster uses. If getNewDirPathIfExists + * Returns the path to the default root dir the minicluster uses. If create * is true, a new root directory path is fetched irrespective of whether it has been fetched * before or not. If false, previous path is used. * Note: this does not cause the root dir to be created. @@ -1102,8 +1102,8 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { } /** - * Same as {{@link HBaseTestingUtility#getDefaultRootDirPath(boolean getNewDirPathIfExists)} - * except that getNewDirPathIfExists flag is false. + * Same as {{@link HBaseTestingUtility#getDefaultRootDirPath(boolean create)} + * except that create flag is false. * Note: this does not cause the root dir to be created. * @return Fully qualified path for the default hbase root dir * @throws IOException @@ -1117,16 +1117,16 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { * version file. Normally you won't make use of this method. Root hbasedir * is created for you as part of mini cluster startup. You'd only use this * method if you were doing manual operation. - * @param getNewDirPathIfExists This flag decides whether to get a new + * @param create This flag decides whether to get a new * root or data directory path or not, if it has been fetched already. * Note : Directory will be made irrespective of whether path has been fetched or not. * If directory already exists, it will be overwritten * @return Fully qualified path to hbase root dir * @throws IOException */ - public Path createRootDir(boolean getNewDirPathIfExists) throws IOException { + public Path createRootDir(boolean create) throws IOException { FileSystem fs = FileSystem.get(this.conf); - Path hbaseRootdir = getDefaultRootDirPath(getNewDirPathIfExists); + Path hbaseRootdir = getDefaultRootDirPath(create); FSUtils.setRootDir(this.conf, hbaseRootdir); fs.mkdirs(hbaseRootdir); FSUtils.setVersion(fs, hbaseRootdir); @@ -1134,8 +1134,8 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { } /** - * Same as {@link HBaseTestingUtility#createRootDir(boolean getNewDirPathIfExists)} - * except that getNewDirPathIfExists flag is false. + * Same as {@link HBaseTestingUtility#createRootDir(boolean create)} + * except that create flag is false. * @return Fully qualified path to hbase root dir * @throws IOException */ @@ -2587,7 +2587,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { * Get a Connection to the cluster. * Not thread-safe (This class needs a lot of work to make it thread-safe). * @return A Connection that can be shared. Don't close. Will be closed on shutdown of cluster. - * @throws IOException + * @throws IOException */ public Connection getConnection() throws IOException { if (this.connection == null) {