Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19947 ITU should overwrite HTU local FS

This commit is contained in:
Mike Drob 2018-02-06 14:08:23 -06:00
parent d95940776e
commit f5dbdf0dab
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
View File

@ -132,6 +132,7 @@ public class IntegrationTestingUtility extends HBaseTestingUtility {
public void createDistributedHBaseCluster() throws IOException { public void createDistributedHBaseCluster() throws IOException {
Configuration conf = getConfiguration(); Configuration conf = getConfiguration();
conf.set("fs.defaultFS", conf.get("original.defaultFS"));
Class<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS, Class<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS,
DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class); DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class);
ClusterManager clusterManager = ReflectionUtils.newInstance( ClusterManager clusterManager = ReflectionUtils.newInstance(

3
hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
View File

@ -346,6 +346,9 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
} }
} }
// Save this for when setting default file:// breaks things
this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));
// Every cluster is a local cluster until we start DFS // Every cluster is a local cluster until we start DFS
// Note that conf could be null, but this.conf will not be // Note that conf could be null, but this.conf will not be
String dataTestDir = getDataTestDir().toString(); String dataTestDir = getDataTestDir().toString();