From 9495fb7d4da66fa4ce15f8dbc6c01b3340439b22 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Tue, 6 Feb 2018 14:08:23 -0600 Subject: [PATCH] HBASE-19947 ITU should overwrite HTU local FS --- .../test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java | 1 + .../src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 4 ++++ 2 files changed, 5 insertions(+) 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 afb21e4b94..a1a81eddbc 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 @@ -132,6 +132,7 @@ public class IntegrationTestingUtility extends HBaseTestingUtility { public void createDistributedHBaseCluster() throws IOException { Configuration conf = getConfiguration(); + conf.set("fs.defaultFS", conf.get("original.defaultFS")); 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 4f55199c46..41af74d09c 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 @@ -346,6 +346,10 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { } } + // Save these in case 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(); -- 2.15.1