From commits-return-7502-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Mon Jan 14 15:36:20 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 [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6366C180608 for ; Mon, 14 Jan 2019 15:36:20 +0100 (CET) Received: (qmail 34338 invoked by uid 500); 14 Jan 2019 14:36:19 -0000 Mailing-List: contact commits-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 commits@zookeeper.apache.org Received: (qmail 34327 invoked by uid 99); 14 Jan 2019 14:36:19 -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; Mon, 14 Jan 2019 14:36:19 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 023AF870B2; Mon, 14 Jan 2019 14:36:18 +0000 (UTC) Date: Mon, 14 Jan 2019 14:36:18 +0000 To: "commits@zookeeper.apache.org" Subject: [zookeeper] branch master updated: ZOOKEEPER-3202: Add timing margin to improve reliability of testClientServerSSL() MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154747657887.15440.729591457165026189@gitbox.apache.org> From: andor@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: a5b3114d70d03f70b068b209fe393388f3c77991 X-Git-Newrev: 14eefcb7bbd1cc93d4738998ca7343cd9cae8277 X-Git-Rev: 14eefcb7bbd1cc93d4738998ca7343cd9cae8277 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zookeeper.git The following commit(s) were added to refs/heads/master by this push: new 14eefcb ZOOKEEPER-3202: Add timing margin to improve reliability of testClientServerSSL() 14eefcb is described below commit 14eefcb7bbd1cc93d4738998ca7343cd9cae8277 Author: Michael Edwards AuthorDate: Mon Jan 14 07:36:15 2019 -0700 ZOOKEEPER-3202: Add timing margin to improve reliability of testClientServerSSL() Allowing just 5 seconds for 3 quorum peers to start and elect a leader is a bit tight, at least when running 4 test processes in parallel inside a (Linux) Docker container on a (non-Linux) laptop. Add up to 10 seconds of extra margin. Author: Michael Edwards Reviewers: andor@apache.org Closes #723 from mkedwards/ZOOKEEPER-3202 --- .../src/test/java/org/apache/zookeeper/test/ClientSSLTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java index a09fc89..1504834 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java @@ -95,6 +95,10 @@ public class ClientSSLTest extends QuorumPeerTestBase { mt[i].start(); } + // Add some timing margin for the quorum to elect a leader + // (without this margin, timeouts have been observed in parallel test runs) + ClientBase.waitForServerUp("127.0.0.1:" + clientPorts[0], 2 * TIMEOUT); + // Servers have been set up. Now go test if secure connection is successful. for (int i = 0; i < SERVER_COUNT; i++) { Assert.assertTrue("waiting for server " + i + " being up",