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 5E0208A7D for ; Mon, 15 Aug 2011 00:54:33 +0000 (UTC) Received: (qmail 89097 invoked by uid 500); 15 Aug 2011 00:54:33 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 89029 invoked by uid 500); 15 Aug 2011 00:54:32 -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 89021 invoked by uid 99); 15 Aug 2011 00:54:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Aug 2011 00:54:32 +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; Mon, 15 Aug 2011 00:54:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 14BB72388847 for ; Mon, 15 Aug 2011 00:54:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157690 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/test/QuorumTest.java Date: Mon, 15 Aug 2011 00:54:09 -0000 To: commits@zookeeper.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110815005410.14BB72388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Mon Aug 15 00:54:09 2011 New Revision: 1157690 URL: http://svn.apache.org/viewvc?rev=1157690&view=rev Log: ZOOKEEPER-1104. CLONE - In QuorumTest, use the same "for ( .. try { break } catch { } )" pattern in testFollowersStartAfterLeaders as in testSessionMove. (Eugene Koontz via mahadev) Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1157690&r1=1157689&r2=1157690&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Mon Aug 15 00:54:09 2011 @@ -383,6 +383,10 @@ IMPROVEMENTS: ZOOKEEPER-1143. quorum send & recv workers are missing thread names (phunt via mahadev) + + ZOOKEEPER-1104. CLONE - In QuorumTest, use the same "for ( .. try { break } + catch { } )" pattern in testFollowersStartAfterLeaders as in testSessionMove. + (Eugene Koontz via mahadev) NEW FEATURES: ZOOKEEPER-729. Java client API to recursively delete a subtree. Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java?rev=1157690&r1=1157689&r2=1157690&view=diff ============================================================================== --- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java (original) +++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java Mon Aug 15 00:54:09 2011 @@ -321,18 +321,14 @@ public class QuorumTest extends ZKTestCa "127.0.0.1:" + qu.getPeer(2).clientPort, CONNECTION_TIMEOUT)); - boolean success = false; for (int i = 0; i < 30; i++) { try { zk.create("/test", "test".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - success = true; break; } catch(KeeperException.ConnectionLossException e) { Thread.sleep(1000); } - } - if (!success) { // test fails if we still can't connect to the quorum after 30 seconds. Assert.fail("client could not connect to reestablished quorum: giving up after 30+ seconds."); }