diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java index a1a81ed..d2ccb68 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java @@ -131,8 +131,14 @@ public class IntegrationTestingUtility extends HBaseTestingUtility { } public void createDistributedHBaseCluster() throws IOException { + //if it is a distributed HBase cluster, use the conf provided by classpath + //to set hbase dir and fs.defaultFS. + //Since when the super class HBaseTestingUtility initializing, it will + //change hbase.rootdir to a local test dir. + //we use "original.defaultFS" and "original.hbase.dir" to restore them. Configuration conf = getConfiguration(); conf.set("fs.defaultFS", conf.get("original.defaultFS")); + conf.set(HConstants.HBASE_DIR, conf.get("original.hbase.dir")); Class clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS, DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class); ClusterManager clusterManager = ReflectionUtils.newInstance( 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 a81ea47..c9751b0 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 @@ -334,7 +334,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { // Save this for when setting default file:// breaks things this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS")); - + this.conf.set("original.hbase.dir", this.conf.get(HConstants.HBASE_DIR)); // Every cluster is a local cluster until we start DFS // Note that conf could be null, but this.conf will not be String dataTestDir = getDataTestDir().toString();