Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7B0B6200CD3 for ; Fri, 23 Jun 2017 00:57:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 79A75160BF1; Thu, 22 Jun 2017 22:57:25 +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 5C985160C0D for ; Fri, 23 Jun 2017 00:57:23 +0200 (CEST) Received: (qmail 77500 invoked by uid 500); 22 Jun 2017 22:57:22 -0000 Mailing-List: contact commits-help@helix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.apache.org Delivered-To: mailing list commits@helix.apache.org Received: (qmail 77231 invoked by uid 99); 22 Jun 2017 22:57:22 -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; Thu, 22 Jun 2017 22:57:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 480A2E96B0; Thu, 22 Jun 2017 22:57:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jxue@apache.org To: commits@helix.apache.org Date: Thu, 22 Jun 2017 22:57:49 -0000 Message-Id: In-Reply-To: <173dae016db149ebb905028df29fb355@git.apache.org> References: <173dae016db149ebb905028df29fb355@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] helix git commit: Add Test for Batch Message ThreadPool archived-at: Thu, 22 Jun 2017 22:57:25 -0000 Add Test for Batch Message ThreadPool Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/22bee729 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/22bee729 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/22bee729 Branch: refs/heads/master Commit: 22bee7298406136433d83a44becc8a625542b632 Parents: ae39857 Author: Junkai Xue Authored: Mon Apr 3 17:25:33 2017 -0700 Committer: Junkai Xue Committed: Wed Apr 5 14:53:42 2017 -0700 ---------------------------------------------------------------------- .../messaging/handling/HelixTaskExecutor.java | 4 +- .../handling/TestResourceThreadpoolSize.java | 48 +++++++++++++++++--- 2 files changed, 44 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/22bee729/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java index 8d3fea1..8e686ee 100644 --- a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java +++ b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java @@ -119,11 +119,11 @@ public class HelixTaskExecutor implements MessageListener, TaskExecutor { final ConcurrentHashMap _hdlrFtyRegistry; final ConcurrentHashMap _executorMap; - + /** * separate executor for executing batch messages */ - private final ExecutorService _batchMessageExecutorService; + final ExecutorService _batchMessageExecutorService; /* Resources whose configuration for dedicate thread pool has been checked.*/ http://git-wip-us.apache.org/repos/asf/helix/blob/22bee729/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java index 33f1c55..81ba71b 100644 --- a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java +++ b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java @@ -24,16 +24,17 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; import org.apache.helix.ConfigAccessor; +import org.apache.helix.HelixManager; +import org.apache.helix.integration.ZkStandAloneCMTestBase; import org.apache.helix.integration.manager.MockParticipantManager; +import org.apache.helix.messaging.DefaultMessagingService; import org.apache.helix.mock.participant.DummyProcess; import org.apache.helix.model.HelixConfigScope; import org.apache.helix.model.IdealState; -import org.apache.helix.HelixManager; -import org.apache.helix.integration.ZkStandAloneCMTestBase; -import org.apache.helix.messaging.DefaultMessagingService; import org.apache.helix.model.Message.MessageType; import org.apache.helix.model.builder.FullAutoModeISBuilder; import org.apache.helix.model.builder.HelixConfigScopeBuilder; +import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier; import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test; @@ -71,7 +72,7 @@ public class TestResourceThreadpoolSize extends ZkStandAloneCMTestBase { int configuredPoolSize = 9; for (MockParticipantManager participant : _participants) { participant.getStateMachineEngine().registerStateModelFactory("OnlineOffline", - new TestOnlineOfflineStateModelFactory(customizedPoolSize), "TestFactory"); + new TestOnlineOfflineStateModelFactory(customizedPoolSize, 0), "TestFactory"); } // add db with default thread pool @@ -113,6 +114,41 @@ public class TestResourceThreadpoolSize extends ZkStandAloneCMTestBase { } } + @Test + public void testBatchMessageThreadPoolSize() throws InterruptedException { + int customizedPoolSize = 5; + _participants[0].getStateMachineEngine().registerStateModelFactory("OnlineOffline", + new TestOnlineOfflineStateModelFactory(customizedPoolSize, 2000), "TestFactory"); + for (int i = 1; i < _participants.length; i++) { + _participants[i].syncStop(); + } + Thread.sleep(2000L); + + // Add 10 dbs with batch message enabled. Each db has 10 partitions. + // So it will have 10 batch messages and each batch message has 10 sub messages. + int numberOfDbs = 10; + for (int i = 0; i < numberOfDbs; i++) { + String dbName = "TestDBABatch" + i; + IdealState idealState = new FullAutoModeISBuilder(dbName).setStateModel("OnlineOffline") + .setStateModelFactoryName("TestFactory").setNumPartitions(10).setNumReplica(1).build(); + idealState.setBatchMessageMode(true); + _setupTool.getClusterManagementTool().addResource(CLUSTER_NAME, dbName, idealState); + _setupTool.rebalanceStorageCluster(CLUSTER_NAME, dbName, 1); + } + Thread.sleep(2000L); + + DefaultMessagingService svc = + (DefaultMessagingService) (_participants[0].getMessagingService()); + HelixTaskExecutor helixExecutor = svc.getExecutor(); + ThreadPoolExecutor executor = (ThreadPoolExecutor) (helixExecutor._batchMessageExecutorService); + Assert.assertNotNull(executor); + Assert.assertTrue(executor.getPoolSize() >= numberOfDbs); + + BestPossibleExternalViewVerifier verifier = + new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR).build(); + Assert.assertTrue(verifier.verify()); + } + private void setResourceThreadPoolSize(String resourceName, int threadPoolSize) { HelixManager manager = _participants[0]; ConfigAccessor accessor = manager.getConfigAccessor(); @@ -127,8 +163,8 @@ public class TestResourceThreadpoolSize extends ZkStandAloneCMTestBase { int _threadPoolSize; ExecutorService _threadPoolExecutor; - public TestOnlineOfflineStateModelFactory(int threadPoolSize) { - super(0); + public TestOnlineOfflineStateModelFactory(int threadPoolSize, int delay) { + super(delay); if (threadPoolSize > 0) { _threadPoolExecutor = Executors.newFixedThreadPool(threadPoolSize); }