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

HBASE-20870 Wrong HBase root dir in ITBLL's Search Tool

This commit is contained in:
Allan Yang 2018-07-20 11:30:43 +08:00 committed by Allan Yang
parent 8461e85880
commit 679698a7f2
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS,
DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class);
ClusterManager clusterManager = ReflectionUtils.newInstance(

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

@ -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();