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 309E7200AE3 for ; Wed, 4 May 2016 16:31:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2F266160A00; Wed, 4 May 2016 14:31:30 +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 7767B1609A1 for ; Wed, 4 May 2016 16:31:29 +0200 (CEST) Received: (qmail 7460 invoked by uid 500); 4 May 2016 14:31:28 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 7451 invoked by uid 99); 4 May 2016 14:31:28 -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, 04 May 2016 14:31:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74042DFC8F; Wed, 4 May 2016 14:31:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Wed, 04 May 2016 14:31:30 -0000 Message-Id: <839b79ab014c405189dba0400b742cea@git.apache.org> In-Reply-To: <2e6ecde8de174947bc5395f4334ccc21@git.apache.org> References: <2e6ecde8de174947bc5395f4334ccc21@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/master to 7ce0e10 archived-at: Wed, 04 May 2016 14:31:30 -0000 Merge pull request #1493 from shapeblue/nio-fix CLOUDSTACK-9348: Use non-blocking SSL handshake in NioConnection/Link- Uses non-blocking socket config in NioClient and NioServer/NioConnection - Scalable connectivity from agents and peer clustered-management server - Removes blocking ssl handshake code with a non-blocking code - Protects from denial-of-service issues that can degrade mgmt server responsiveness due to an aggressive/malicious client - Uses separate executor services for handling connect/accept events Changes are covered the NioTest so I did not write a new test, advise how we can improve this. Further, I tried to invest time on writing a benchmark test to reproduce a degraded server but could not write it deterministic-ally (sometimes fails/passes but not always). Review, CI testing and feedback requested /cc @swill @jburwell @DaanHoogland @wido @remibergsma @rafaelweingartner @GabrielBrascher * pr/1493: CLOUDSTACK-9348: Use non-blocking SSL handshake CLOUDSTACK-9348: Unit test to demonstrate denial of service attack Signed-off-by: Will Stevens Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ce0e10f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ce0e10f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ce0e10f Branch: refs/heads/master Commit: 7ce0e10fbcd949375e43535aae168421ecdaa562 Parents: 29ba71f ba77a69 Author: Will Stevens Authored: Wed May 4 10:30:58 2016 -0400 Committer: Will Stevens Committed: Wed May 4 10:30:58 2016 -0400 ---------------------------------------------------------------------- .../manager/ClusteredAgentManagerImpl.java | 9 +- utils/pom.xml | 1 - .../src/main/java/com/cloud/utils/nio/Link.java | 294 ++++++++++++------- .../java/com/cloud/utils/nio/NioClient.java | 31 +- .../java/com/cloud/utils/nio/NioConnection.java | 84 +++--- .../java/com/cloud/utils/nio/NioServer.java | 8 +- .../java/com/cloud/utils/testcase/NioTest.java | 249 ++++++++++------ 7 files changed, 406 insertions(+), 270 deletions(-) ----------------------------------------------------------------------