From 1a6fae74b5d3ab5e206a94dc494bdb5c4008a974 Mon Sep 17 00:00:00 2001 From: Allan Yang Date: Fri, 20 Jul 2018 11:22:03 +0800 Subject: [PATCH] HBASE-20870 Wrong HBase root dir in ITBLL's Search Tool --- .../hadoop/hbase/IntegrationTestingUtility.java | 14 +++++++++++++- .../apache/hadoop/hbase/HBaseTestingUtility.java | 8 ++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) 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 a1a81eddbcb..a9e555eaec9 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,20 @@ 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")); + if (conf.get("original.defaultFS") != null) { + conf.set("fs.defaultFS", conf.get("original.defaultFS")); + } + if (conf.get("original.hbase.dir") != null) { + conf.set(HConstants.HBASE_DIR, conf.get("original.hbase.dir")); + } + LOG.debug("Setting {} to {} since it is a distributed cluster", + HConstants.HBASE_DIR, conf.get(HConstants.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 c99d9191b4d..03d5d76c0f2 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 @@ -333,8 +333,12 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { ChecksumUtil.generateExceptionForChecksumFailureForTest(true); // Save this for when setting default file:// breaks things - this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS")); - + if (this.conf.get("fs.defaultFS") != null) { + this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS")); + } + if (this.conf.get(HConstants.HBASE_DIR) != null) { + 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();