You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/01/19 13:24:44 UTC
[10/31] hbase git commit: HBASE-19808 Reenable TestMultiParallel
HBASE-19808 Reenable TestMultiParallel
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a3c98b2d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a3c98b2d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a3c98b2d
Branch: refs/heads/HBASE-19064
Commit: a3c98b2dd8835db3989699d780e61c8321361170
Parents: 8a8be33
Author: Michael Stack <st...@apache.org>
Authored: Tue Jan 16 22:12:43 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Wed Jan 17 08:58:37 2018 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/client/TestMultiParallel.java | 6 +++---
.../hbase/regionserver/TestRegionServerReadRequestMetrics.java | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a3c98b2d/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
index a81447b..68659e1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
@@ -58,13 +58,11 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore // Depends on Master being able to host regions. Needs fixing.
@Category({MediumTests.class, FlakeyTests.class})
public class TestMultiParallel {
private static final Logger LOG = LoggerFactory.getLogger(TestMultiParallel.class);
@@ -90,7 +88,9 @@ public class TestMultiParallel {
UTIL.getConfiguration().set(HConstants.RPC_CODEC_CONF_KEY,
KeyValueCodec.class.getCanonicalName());
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()
.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyMasterObserver.class.getName());
UTIL.startMiniCluster(slaves);
http://git-wip-us.apache.org/repos/asf/hbase/blob/a3c98b2d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java
index c5afefa..21f4fb6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java
@@ -105,7 +105,7 @@ public class TestRegionServerReadRequestMetrics {
public static void setUpOnce() throws Exception {
// Default starts one regionserver only.
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();
admin = TEST_UTIL.getAdmin();
serverNames = admin.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS))
@@ -326,6 +326,7 @@ public class TestRegionServerReadRequestMetrics {
testReadRequests(resultCount, 1, 0);
}
+ @Ignore // HBASE-19785
@Test
public void testReadRequestsCountWithFilter() throws Exception {
int resultCount;
@@ -372,6 +373,7 @@ public class TestRegionServerReadRequestMetrics {
// testReadRequests(resultCount, 0, 1);
}
+ @Ignore // HBASE-19785
@Test
public void testReadRequestsCountWithDeletedRow() throws Exception {
try {
@@ -409,6 +411,7 @@ public class TestRegionServerReadRequestMetrics {
}
}
+ @Ignore // See HBASE-19785
@Test
public void testReadRequestsWithCoprocessor() throws Exception {
TableName tableName = TableName.valueOf("testReadRequestsWithCoprocessor");