From notifications-return-1236-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Fri Aug 9 18:02:21 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9412318063F for ; Fri, 9 Aug 2019 20:02:21 +0200 (CEST) Received: (qmail 22486 invoked by uid 500); 9 Aug 2019 18:02:20 -0000 Mailing-List: contact notifications-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list notifications@zookeeper.apache.org Received: (qmail 22477 invoked by uid 99); 9 Aug 2019 18:02:20 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Aug 2019 18:02:20 +0000 From: GitBox To: notifications@zookeeper.apache.org Subject: [GitHub] [zookeeper] lvfangmin commented on a change in pull request #1027: [ZOOKEEPER-3473] Improving successful TLS handshake throughput with concurrent control Message-ID: <156537374053.29617.9817732272592625602.gitbox@gitbox.apache.org> Date: Fri, 09 Aug 2019 18:02:20 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit lvfangmin commented on a change in pull request #1027: [ZOOKEEPER-3473] Improving successful TLS handshake throughput with concurrent control URL: https://github.com/apache/zookeeper/pull/1027#discussion_r312590431 ########## File path: zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnFactoryTest.java ########## @@ -0,0 +1,121 @@ +/** + * 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 + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.zookeeper.server; + +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.WatchedEvent; +import org.apache.zookeeper.ZooKeeper; +import org.apache.zookeeper.common.ClientX509Util; +import org.apache.zookeeper.server.metric.SimpleCounter; +import org.apache.zookeeper.test.ClientBase; +import org.apache.zookeeper.test.SSLAuthTest; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class NettyServerCnxnFactoryTest extends ClientBase { + + private static final Logger LOG = LoggerFactory + .getLogger(NettyServerCnxnFactoryTest.class); + + @Override + public void setUp() throws Exception { + System.setProperty(ServerCnxnFactory.ZOOKEEPER_SERVER_CNXN_FACTORY, + "org.apache.zookeeper.server.NettyServerCnxnFactory"); + super.setUp(); + } + + @Override + public void tearDown() throws Exception { + System.clearProperty(ServerCnxnFactory.ZOOKEEPER_SERVER_CNXN_FACTORY); + super.tearDown(); + } + + @Test + public void testOutstandingHandshakeLimit() throws Exception { + + SimpleCounter tlsHandshakeExceeded = (SimpleCounter) ServerMetrics.getMetrics().TLS_HANDSHAKE_EXCEEDED; + tlsHandshakeExceeded.reset(); + Assert.assertEquals(tlsHandshakeExceeded.get(), 0); + + ClientX509Util x509Util = SSLAuthTest.setUpSecure(); + NettyServerCnxnFactory factory = (NettyServerCnxnFactory) serverFactory; + factory.setSecure(true); + factory.setOutstandingHandshakeLimit(10); + + int threadNum = 3; + int cnxnPerThread = 10; + Thread[] cnxnWorker = new Thread[threadNum]; + final LinkedBlockingQueue zks = new LinkedBlockingQueue(); + + AtomicInteger cnxnCreated = new AtomicInteger(0); + CountDownLatch latch = new CountDownLatch(1); + + for (int i = 0; i < cnxnWorker.length; i++) { + cnxnWorker[i] = new Thread() { + @Override + public void run() { + for (int i = 0; i < cnxnPerThread; i++) { + try { + zks.add(new ZooKeeper(hostPort, 3000, new Watcher() { + @Override + public void process(WatchedEvent event) { + int created = cnxnCreated.addAndGet(1); + if (created == threadNum * cnxnPerThread) { + latch.countDown(); + } + } + })); + } catch (Exception e) { + LOG.info("Error while creating zk client", e); + } + } + } + }; + cnxnWorker[i].start(); + } + + Assert.assertTrue(latch.await(3, TimeUnit.SECONDS)); Review comment: That's a good suggestion, I've changed to use assertThat, will add the description as well. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services