You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/11/16 21:49:21 UTC
hbase git commit: HBASE-19268 Enable Replica tests that were disabled
by Proc-V2 AM in HBASE-14614
Repository: hbase
Updated Branches:
refs/heads/branch-2 2c1ded542 -> 9fecb3b2c
HBASE-19268 Enable Replica tests that were disabled by Proc-V2 AM in HBASE-14614
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9fecb3b2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9fecb3b2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9fecb3b2
Branch: refs/heads/branch-2
Commit: 9fecb3b2c8829ae614ba2724b82778cfab34f5ec
Parents: 2c1ded5
Author: Michael Stack <st...@apache.org>
Authored: Wed Nov 15 13:50:13 2017 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Thu Nov 16 13:49:11 2017 -0800
----------------------------------------------------------------------
.../balancer/TestStochasticLoadBalancer2.java | 23 +++++++++++++-------
.../hbase/regionserver/TestRegionReplicas.java | 2 --
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9fecb3b2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer2.java
index 78557b7..0b69a4a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer2.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* 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.LogFactory;
+import org.apache.hadoop.hbase.CategoryBasedTimeout;
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.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.Ignore;
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 {
private static final Log LOG = LogFactory.getLog(TestStochasticLoadBalancer2.class);
+ @Rule
+ public final TestRule timeout = CategoryBasedTimeout.builder()
+ .withTimeout(this.getClass())
+ .withLookingForStuckThread(true)
+ .build();
@Before
public void before() {
@@ -47,7 +54,7 @@ public class TestStochasticLoadBalancer2 extends BalancerTestBase {
loadBalancer.setConf(conf);
}
- @Test (timeout = 800000)
+ @Test
public void testRegionReplicasOnMidCluster() {
int numNodes = 200;
int numRegions = 40 * 200;
@@ -57,7 +64,7 @@ public class TestStochasticLoadBalancer2 extends BalancerTestBase {
testWithCluster(numNodes, numRegions, numRegionsPerServer, replication, numTables, true, true);
}
- @Test (timeout = 800000)
+ @Test
public void testRegionReplicasOnLargeCluster() {
int numNodes = 1000;
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);
}
- @Ignore @Test (timeout = 800000)
+ @Test
public void testRegionReplicasOnMidClusterHighReplication() {
conf.setLong(StochasticLoadBalancer.MAX_STEPS_KEY, 4000000L);
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);
}
- @Test (timeout = 800000)
+ @Test
public void testRegionReplicationOnMidClusterReplicationGreaterThanNumNodes() {
conf.setLong("hbase.master.balancer.stochastic.maxRunningTime", 120 * 1000); // 120 sec
loadBalancer.setConf(conf);
http://git-wip-us.apache.org/repos/asf/hbase/blob/9fecb3b2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java
index 1a5a91d..41bf11e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java
@@ -55,7 +55,6 @@ import org.apache.hadoop.util.StringUtils;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -306,7 +305,6 @@ public class TestRegionReplicas {
}
}
- @Ignore
@Test(timeout = 300000)
public void testFlushAndCompactionsInPrimary() throws Exception {