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 49F5C200BBA for ; Sat, 5 Nov 2016 21:20:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 48F2D160AE9; Sat, 5 Nov 2016 20:20:22 +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 7BAB2160B1F for ; Sat, 5 Nov 2016 21:20:20 +0100 (CET) Received: (qmail 27691 invoked by uid 500); 5 Nov 2016 20:20:19 -0000 Mailing-List: contact commits-help@avro.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@avro.apache.org Delivered-To: mailing list commits@avro.apache.org Received: (qmail 27396 invoked by uid 99); 5 Nov 2016 20:20:19 -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; Sat, 05 Nov 2016 20:20:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57455E1772; Sat, 5 Nov 2016 20:20:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blue@apache.org To: commits@avro.apache.org Date: Sat, 05 Nov 2016 20:20:48 -0000 Message-Id: <751ab0d441254d4bbd144a4a29df0b76@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/35] avro git commit: AVRO-1943 - Flaky test: TestNettyServerWithCompression.testConnectionsCount archived-at: Sat, 05 Nov 2016 20:20:22 -0000 AVRO-1943 - Flaky test: TestNettyServerWithCompression.testConnectionsCount Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/30f90d12 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/30f90d12 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/30f90d12 Branch: refs/heads/branch-1.8 Commit: 30f90d1237060171f9909d0696bd0bb0d0b8c719 Parents: b2a2256 Author: Gabor Szadovszky Authored: Wed Oct 26 14:42:39 2016 +0200 Committer: Ryan Blue Committed: Sat Nov 5 13:19:07 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../java/org/apache/avro/ipc/TestNettyServer.java | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/30f90d12/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1394d70..44605eb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -84,6 +84,10 @@ Trunk (not yet released) AVRO-1882: Java: Fix ConcurrentHashMap with non-string keys. (Sachin Goyal via blue) + AVRO-1943: Java: Flaky test: + TestNettyServerWithCompression.testConnectionsCount + (Gabor Szadovszky via tomwhite) + Avro 1.8.1 (14 May 2016) INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/avro/blob/30f90d12/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java ---------------------------------------------------------------------- diff --git a/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java b/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java index 14981c3..cf02bad 100644 --- a/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java +++ b/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java @@ -24,12 +24,11 @@ import static org.junit.Assert.assertEquals; import java.net.InetSocketAddress; import java.net.Socket; -import java.net.UnknownHostException; import java.nio.charset.Charset; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.avro.ipc.specific.SpecificRequestor; import org.apache.avro.ipc.specific.SpecificResponder; @@ -149,7 +148,16 @@ public class TestNettyServer { proxy2.fireandforget(createMessage()); Assert.assertEquals(2, ((NettyServer) server).getNumActiveConnections()); transceiver2.close(); - Assert.assertEquals(1, ((NettyServer) server).getNumActiveConnections()); + + // Check the active connections with some retries as closing at the client + // side might not take effect on the server side immediately + int numActiveConnections = ((NettyServer) server).getNumActiveConnections(); + for (int i = 0; i < 50 && numActiveConnections == 2; ++i) { + System.out.println("Server still has 2 active connections; retrying..."); + Thread.sleep(100); + numActiveConnections = ((NettyServer) server).getNumActiveConnections(); + } + Assert.assertEquals(1, numActiveConnections); } private Message createMessage() {