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 2488d20eb07..dbd23602bd1 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; } }