From commits-return-65609-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Wed Jan 17 18:00:03 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 859B218062C for ; Wed, 17 Jan 2018 18:00:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 72F62160C35; Wed, 17 Jan 2018 17:00:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B7100160C1B for ; Wed, 17 Jan 2018 18:00:02 +0100 (CET) Received: (qmail 6391 invoked by uid 500); 17 Jan 2018 17:00:01 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 6382 invoked by uid 99); 17 Jan 2018 17:00:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2018 17:00:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A11D9DFCFA; Wed, 17 Jan 2018 17:00:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-19808 Reenable TestMultiParallel Date: Wed, 17 Jan 2018 17:00:01 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-2 f22cf7226 -> addd71654 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/addd7165 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/addd7165 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/addd7165 Branch: refs/heads/branch-2 Commit: addd716549b324943ccf76f3a7f28824e9e0b5b1 Parents: f22cf72 Author: Michael Stack Authored: Tue Jan 16 22:12:43 2018 -0800 Committer: Michael Stack Committed: Wed Jan 17 08:59:05 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/addd7165/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/addd7165/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");