You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2017/12/15 02:37:16 UTC
hbase git commit: HBASE-19516 IntegrationTestBulkLoad and
IntegrationTestImportTsv run into 'java.lang.RuntimeException:
DistributedHBaseCluster@1bb564e2 not an instance of MiniHBaseCluster' (Ankit)
Repository: hbase
Updated Branches:
refs/heads/master 661491b56 -> deba43b15
HBASE-19516 IntegrationTestBulkLoad and IntegrationTestImportTsv run into 'java.lang.RuntimeException: DistributedHBaseCluster@1bb564e2 not an instance of MiniHBaseCluster' (Ankit)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/deba43b1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/deba43b1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/deba43b1
Branch: refs/heads/master
Commit: deba43b156d9598a2850a4f250d98a60b0ffee6a
Parents: 661491b
Author: tedyu <yu...@gmail.com>
Authored: Thu Dec 14 18:37:09 2017 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Thu Dec 14 18:37:09 2017 -0800
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/deba43b1/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 2488d20..dbd2360 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
@@ -3282,7 +3282,8 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
ServerName serverName =
ServerName.valueOf(Bytes.toString(server).replaceFirst(":", ",") + "," +
Bytes.toLong(startCode));
- if (getHBaseCluster().isKilledRS(serverName)) {
+ if (!getHBaseClusterInterface().isDistributedCluster()
+ && getHBaseCluster().isKilledRS(serverName)) {
return false;
}
}