Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19268 Enable Replica tests that were disabled by Proc-V2 AM in HBASE-14614

This commit is contained in:
Michael Stack 2017-11-15 13:50:13 -08:00
parent 6f9651b417
commit f7212aaeba
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer2.java
View File

@ -1,4 +1,4 @@
/** /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information * distributed with this work for additional information
@ -19,17 +19,24 @@ package org.apache.hadoop.hbase.master.balancer;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.CategoryBasedTimeout;
import org.apache.hadoop.hbase.testclassification.FlakeyTests; import org.apache.hadoop.hbase.testclassification.FlakeyTests;
import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.Ignore;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.rules.TestRule;
@Category({FlakeyTests.class, MediumTests.class}) @Category({FlakeyTests.class, LargeTests.class})
public class TestStochasticLoadBalancer2 extends BalancerTestBase { public class TestStochasticLoadBalancer2 extends BalancerTestBase {
private static final Log LOG = LogFactory.getLog(TestStochasticLoadBalancer2.class); private static final Log LOG = LogFactory.getLog(TestStochasticLoadBalancer2.class);
@Rule
public final TestRule timeout = CategoryBasedTimeout.builder()
.withTimeout(this.getClass())
.withLookingForStuckThread(true)
.build();
@Before @Before
public void before() { public void before() {
@ -47,7 +54,7 @@ public class TestStochasticLoadBalancer2 extends BalancerTestBase {
loadBalancer.setConf(conf); loadBalancer.setConf(conf);
} }
@Test (timeout = 800000) @Test
public void testRegionReplicasOnMidCluster() { public void testRegionReplicasOnMidCluster() {
int numNodes = 200; int numNodes = 200;
int numRegions = 40 * 200; int numRegions = 40 * 200;
@ -57,7 +64,7 @@ public class TestStochasticLoadBalancer2 extends BalancerTestBase {
testWithCluster(numNodes, numRegions, numRegionsPerServer, replication, numTables, true, true); testWithCluster(numNodes, numRegions, numRegionsPerServer, replication, numTables, true, true);
} }
@Test (timeout = 800000) @Test
public void testRegionReplicasOnLargeCluster() { public void testRegionReplicasOnLargeCluster() {
int numNodes = 1000; int numNodes = 1000;
int numRegions = 20 * numNodes; // 20 * replication regions per RS int numRegions = 20 * numNodes; // 20 * replication regions per RS
@ -67,7 +74,7 @@ public class TestStochasticLoadBalancer2 extends BalancerTestBase {
testWithCluster(numNodes, numRegions, numRegionsPerServer, replication, numTables, true, true); testWithCluster(numNodes, numRegions, numRegionsPerServer, replication, numTables, true, true);
} }
@Ignore @Test (timeout = 800000) @Test
public void testRegionReplicasOnMidClusterHighReplication() { public void testRegionReplicasOnMidClusterHighReplication() {
conf.setLong(StochasticLoadBalancer.MAX_STEPS_KEY, 4000000L); conf.setLong(StochasticLoadBalancer.MAX_STEPS_KEY, 4000000L);
conf.setLong("hbase.master.balancer.stochastic.maxRunningTime", 120 * 1000); // 120 sec conf.setLong("hbase.master.balancer.stochastic.maxRunningTime", 120 * 1000); // 120 sec
@ -80,7 +87,7 @@ public class TestStochasticLoadBalancer2 extends BalancerTestBase {
testWithCluster(numNodes, numRegions, numRegionsPerServer, replication, numTables, false, true); testWithCluster(numNodes, numRegions, numRegionsPerServer, replication, numTables, false, true);
} }
@Test (timeout = 800000) @Test
public void testRegionReplicationOnMidClusterReplicationGreaterThanNumNodes() { public void testRegionReplicationOnMidClusterReplicationGreaterThanNumNodes() {
conf.setLong("hbase.master.balancer.stochastic.maxRunningTime", 120 * 1000); // 120 sec conf.setLong("hbase.master.balancer.stochastic.maxRunningTime", 120 * 1000); // 120 sec
loadBalancer.setConf(conf); loadBalancer.setConf(conf);

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java
View File

@ -55,7 +55,6 @@ import org.apache.hadoop.util.StringUtils;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@ -306,7 +305,6 @@ public class TestRegionReplicas {
} }
} }
@Ignore
@Test(timeout = 300000) @Test(timeout = 300000)
public void testFlushAndCompactionsInPrimary() throws Exception { public void testFlushAndCompactionsInPrimary() throws Exception {