HBASE-15062 IntegrationTestMTTR conditionally run some tests.

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Samir Ahmic 2015-12-31 17:02:24 +01:00 committed by Michael Stack
parent f4c99a6a89
commit 0f39f08740
1 changed files with 11 additions and 0 deletions

View File

@ -19,6 +19,7 @@
package org.apache.hadoop.hbase.mttr; package org.apache.hadoop.hbase.mttr;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeFalse;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -266,6 +267,15 @@ public class IntegrationTestMTTR {
loadTool = null; 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 @Test
public void testRestartRsHoldingTable() throws Exception { public void testRestartRsHoldingTable() throws Exception {
@ -274,6 +284,7 @@ public class IntegrationTestMTTR {
@Test @Test
public void testKillRsHoldingMeta() throws Exception { public void testKillRsHoldingMeta() throws Exception {
assumeFalse(tablesOnMaster());
run(new ActionCallable(restartMetaAction), "KillRsHoldingMeta"); run(new ActionCallable(restartMetaAction), "KillRsHoldingMeta");
} }