From commits-return-6131-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Fri Jan 19 00:56:14 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 58A30180654 for ; Fri, 19 Jan 2018 00:56:14 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 489CC160C48; Thu, 18 Jan 2018 23:56:14 +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 8FCD3160C26 for ; Fri, 19 Jan 2018 00:56:13 +0100 (CET) Received: (qmail 41725 invoked by uid 500); 18 Jan 2018 23:56:12 -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 41714 invoked by uid 99); 18 Jan 2018 23:56:12 -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, 18 Jan 2018 23:56:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9DC5BDFD7B; Thu, 18 Jan 2018 23:56:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: phunt@apache.org To: commits@zookeeper.apache.org Message-Id: <01953ab4574d4e40b561ae5377902409@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zookeeper git commit: ZOOKEEPER-2961: Fix testElectionFraud Flakyness Date: Thu, 18 Jan 2018 23:56:12 +0000 (UTC) Repository: zookeeper Updated Branches: refs/heads/master 4d629d289 -> 77d6b763a ZOOKEEPER-2961: Fix testElectionFraud Flakyness This test relies on hooking into our logging system and creates a new appender using a PatternLayout object shared with the CONSOLE appender. PatternLayout has some synchronization issues (https://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html) so we should create a new instance of it. Author: Abraham Fine Reviewers: phunt@apache.org Closes #437 from afine/ZOOKEEPER-2961_master Change-Id: I1c81d37b94b12e0721a671deb2fc983773f88fd9 Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/77d6b763 Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/77d6b763 Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/77d6b763 Branch: refs/heads/master Commit: 77d6b763a7772553ecfa81e3d3ef177452ad16a7 Parents: 4d629d2 Author: Abraham Fine Authored: Thu Jan 18 15:52:43 2018 -0800 Committer: Patrick Hunt Committed: Thu Jan 18 15:52:43 2018 -0800 ---------------------------------------------------------------------- .../org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/77d6b763/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java ---------------------------------------------------------------------- diff --git a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java b/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java index 2a02428..9c6bd3a 100644 --- a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java +++ b/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java @@ -34,6 +34,7 @@ import java.util.regex.Pattern; import org.apache.log4j.Layout; import org.apache.log4j.Level; import org.apache.log4j.Logger; +import org.apache.log4j.PatternLayout; import org.apache.log4j.WriterAppender; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; @@ -346,9 +347,9 @@ public class QuorumPeerMainTest extends QuorumPeerTestBase { @Test public void testElectionFraud() throws IOException, InterruptedException { // capture QuorumPeer logging - Layout layout = Logger.getRootLogger().getAppender("CONSOLE").getLayout(); ByteArrayOutputStream os = new ByteArrayOutputStream(); - WriterAppender appender = new WriterAppender(layout, os); + String loggingPattern = ((PatternLayout) Logger.getRootLogger().getAppender("CONSOLE").getLayout()).getConversionPattern(); + WriterAppender appender = new WriterAppender(new PatternLayout(loggingPattern), os); appender.setThreshold(Level.INFO); Logger qlogger = Logger.getLogger(QuorumPeer.class); qlogger.addAppender(appender);