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

HBASE-19808 Reenable TestMultiParallel

This commit is contained in:
Michael Stack 2018-01-16 22:12:43 -08:00
parent f22cf7226e
commit addd716549
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
View File

@ -58,13 +58,11 @@ import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
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;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@Ignore // Depends on Master being able to host regions. Needs fixing.
@Category({MediumTests.class, FlakeyTests.class}) @Category({MediumTests.class, FlakeyTests.class})
public class TestMultiParallel { public class TestMultiParallel {
private static final Logger LOG = LoggerFactory.getLogger(TestMultiParallel.class); private static final Logger LOG = LoggerFactory.getLogger(TestMultiParallel.class);
@ -90,7 +88,9 @@ public class TestMultiParallel {
UTIL.getConfiguration().set(HConstants.RPC_CODEC_CONF_KEY, UTIL.getConfiguration().set(HConstants.RPC_CODEC_CONF_KEY,
KeyValueCodec.class.getCanonicalName()); KeyValueCodec.class.getCanonicalName());
UTIL.getConfiguration().setBoolean(LoadBalancer.TABLES_ON_MASTER, true); UTIL.getConfiguration().setBoolean(LoadBalancer.TABLES_ON_MASTER, true);
UTIL.getConfiguration().setBoolean(LoadBalancer.SYSTEM_TABLES_ON_MASTER, true); // We used to ask for system tables on Master exclusively but not needed by test and doesn't
// work anyways -- so commented out.
// UTIL.getConfiguration().setBoolean(LoadBalancer.SYSTEM_TABLES_ON_MASTER, true);
UTIL.getConfiguration() UTIL.getConfiguration()
.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyMasterObserver.class.getName()); .set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyMasterObserver.class.getName());
UTIL.startMiniCluster(slaves); UTIL.startMiniCluster(slaves);

5
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java
View File

@ -105,7 +105,7 @@ public class TestRegionServerReadRequestMetrics {
public static void setUpOnce() throws Exception { public static void setUpOnce() throws Exception {
// Default starts one regionserver only. // Default starts one regionserver only.
TEST_UTIL.getConfiguration().setBoolean(LoadBalancer.TABLES_ON_MASTER, true); TEST_UTIL.getConfiguration().setBoolean(LoadBalancer.TABLES_ON_MASTER, true);
TEST_UTIL.getConfiguration().setBoolean(LoadBalancer.SYSTEM_TABLES_ON_MASTER, true); // TEST_UTIL.getConfiguration().setBoolean(LoadBalancer.SYSTEM_TABLES_ON_MASTER, true);
TEST_UTIL.startMiniCluster(); TEST_UTIL.startMiniCluster();
admin = TEST_UTIL.getAdmin(); admin = TEST_UTIL.getAdmin();
serverNames = admin.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS)) serverNames = admin.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS))
@ -326,6 +326,7 @@ public class TestRegionServerReadRequestMetrics {
testReadRequests(resultCount, 1, 0); testReadRequests(resultCount, 1, 0);
} }
@Ignore // HBASE-19785
@Test @Test
public void testReadRequestsCountWithFilter() throws Exception { public void testReadRequestsCountWithFilter() throws Exception {
int resultCount; int resultCount;
@ -372,6 +373,7 @@ public class TestRegionServerReadRequestMetrics {
// testReadRequests(resultCount, 0, 1); // testReadRequests(resultCount, 0, 1);
} }
@Ignore // HBASE-19785
@Test @Test
public void testReadRequestsCountWithDeletedRow() throws Exception { public void testReadRequestsCountWithDeletedRow() throws Exception {
try { try {
@ -409,6 +411,7 @@ public class TestRegionServerReadRequestMetrics {
} }
} }
@Ignore // See HBASE-19785
@Test @Test
public void testReadRequestsWithCoprocessor() throws Exception { public void testReadRequestsWithCoprocessor() throws Exception {
TableName tableName = TableName.valueOf("testReadRequestsWithCoprocessor"); TableName tableName = TableName.valueOf("testReadRequestsWithCoprocessor");