Repository: hbase Updated Branches: refs/heads/master f1b97a6aa -> ba54af331
HBASE-15062 IntegrationTestMTTR conditionally run some tests. Signed-off-by: Michael Stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ba54af33 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ba54af33 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ba54af33 Branch: refs/heads/master Commit: ba54af3318a3584cdf685e6be8b5f668aff8a492 Parents: f1b97a6 Author: Samir Ahmic <[email protected]> Authored: Thu Dec 31 17:02:24 2015 +0100 Committer: Michael Stack <[email protected]> Committed: Sun Jul 2 22:00:51 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/mttr/IntegrationTestMTTR.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ba54af33/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index bd14c31..58037d2 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.mttr; import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeFalse; import java.io.IOException; import java.util.ArrayList; @@ -266,6 +267,15 @@ public class IntegrationTestMTTR { loadTool = null; } + + private static boolean tablesOnMaster() { + boolean ret = true; + String value = util.getConfiguration().get("hbase.balancer.tablesOnMaster"); + if( value != null && value.equalsIgnoreCase("none")) { + ret = false; + } + return ret; + } @Test public void testRestartRsHoldingTable() throws Exception { @@ -274,6 +284,7 @@ public class IntegrationTestMTTR { @Test public void testKillRsHoldingMeta() throws Exception { + assumeFalse(tablesOnMaster()); run(new ActionCallable(restartMetaAction), "KillRsHoldingMeta"); }
