You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by md...@apache.org on 2018/02/07 22:56:32 UTC
[1/2] hbase git commit: HBASE-19947 ITU should overwrite HTU local FS
Repository: hbase
Updated Branches:
refs/heads/branch-2 26ccbc49b -> 7d449892a
refs/heads/master d95940776 -> f5dbdf0da
HBASE-19947 ITU should overwrite HTU local FS
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f5dbdf0d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f5dbdf0d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f5dbdf0d
Branch: refs/heads/master
Commit: f5dbdf0dab731a986d9aea2ad3dfdb400f1ba46c
Parents: d959407
Author: Mike Drob <md...@apache.org>
Authored: Tue Feb 6 14:08:23 2018 -0600
Committer: Mike Drob <md...@apache.org>
Committed: Wed Feb 7 16:53:54 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/IntegrationTestingUtility.java | 1 +
.../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5dbdf0d/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
----------------------------------------------------------------------
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 afb21e4..a1a81ed 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<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS,
DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class);
ClusterManager clusterManager = ReflectionUtils.newInstance(
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5dbdf0d/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
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 4f55199..2bdfd2d 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,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
// Note that conf could be null, but this.conf will not be
String dataTestDir = getDataTestDir().toString();
[2/2] hbase git commit: HBASE-19947 ITU should overwrite HTU local FS
Posted by md...@apache.org.
HBASE-19947 ITU should overwrite HTU local FS
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7d449892
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7d449892
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7d449892
Branch: refs/heads/branch-2
Commit: 7d449892af674a8907003c3fa7e82a8d6fb8bdf5
Parents: 26ccbc4
Author: Mike Drob <md...@apache.org>
Authored: Tue Feb 6 14:08:23 2018 -0600
Committer: Mike Drob <md...@apache.org>
Committed: Wed Feb 7 16:56:11 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/IntegrationTestingUtility.java | 1 +
.../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7d449892/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
----------------------------------------------------------------------
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 afb21e4..a1a81ed 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<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS,
DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class);
ClusterManager clusterManager = ReflectionUtils.newInstance(
http://git-wip-us.apache.org/repos/asf/hbase/blob/7d449892/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
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 4f55199..2bdfd2d 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,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
// Note that conf could be null, but this.conf will not be
String dataTestDir = getDataTestDir().toString();