Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C5885106B8 for ; Wed, 18 Dec 2013 15:51:51 +0000 (UTC) Received: (qmail 83101 invoked by uid 500); 18 Dec 2013 15:49:23 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 82338 invoked by uid 500); 18 Dec 2013 15:48:49 -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@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 82274 invoked by uid 99); 18 Dec 2013 15:48:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 15:48:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 15:48:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4E7BD23889E0; Wed, 18 Dec 2013 15:48:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1551985 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/test/org/apache/zookeeper/test/FLETest.java Date: Wed, 18 Dec 2013 15:48:20 -0000 To: commits@zookeeper.apache.org From: fpj@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131218154820.4E7BD23889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fpj Date: Wed Dec 18 15:48:19 2013 New Revision: 1551985 URL: http://svn.apache.org/r1551985 Log: ZOOKEEPER-1733. FLETest#testLE is flaky on windows boxes (michim via fpj) Modified: zookeeper/branches/branch-3.4/CHANGES.txt zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/FLETest.java Modified: zookeeper/branches/branch-3.4/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1551985&r1=1551984&r2=1551985&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/CHANGES.txt (original) +++ zookeeper/branches/branch-3.4/CHANGES.txt Wed Dec 18 15:48:19 2013 @@ -199,6 +199,9 @@ BUGFIXES: ZOOKEEPER-1841. problem in QuorumTest (Germán via fpj) + ZOOKEEPER-1733. FLETest#testLE is flaky on windows boxes + (michim via fpj) + IMPROVEMENTS: ZOOKEEPER-1564. Allow JUnit test build with IBM Java Modified: zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/FLETest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/FLETest.java?rev=1551985&r1=1551984&r2=1551985&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/FLETest.java (original) +++ zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/FLETest.java Wed Dec 18 15:48:19 2013 @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Random; +import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,6 +75,7 @@ public class FLETest extends ZKTestCase volatile long leader = -1; //volatile int round = 1; Random rand = new Random(); + Set joinedThreads; @Before public void setUp() throws Exception { @@ -87,6 +89,7 @@ public class FLETest extends ZKTestCase port = new int[count]; successCount = 0; finalObj = new Object(); + joinedThreads = new HashSet(); } @After @@ -180,6 +183,7 @@ public class FLETest extends ZKTestCase if(leader == i){ synchronized(finalObj){ successCount++; + joinedThreads.add((long)i); if(successCount > (count/2)) finalObj.notify(); } @@ -224,6 +228,7 @@ public class FLETest extends ZKTestCase if (leader == votes[i].getId()) { synchronized(finalObj){ successCount++; + joinedThreads.add((long)i); if(successCount > (count/2)) finalObj.notify(); } break; @@ -309,8 +314,10 @@ public class FLETest extends ZKTestCase Assert.fail("Fewer than a a majority has joined"); } - if(threads.get((int) leader).isAlive()){ - Assert.fail("Leader hasn't joined: " + leader); + synchronized(finalObj){ + if(!joinedThreads.contains(leader)){ + Assert.fail("Leader hasn't joined: " + leader); + } } }