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 2E6729CFD for ; Fri, 6 Jan 2012 01:33:26 +0000 (UTC) Received: (qmail 25387 invoked by uid 500); 6 Jan 2012 01:33:26 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 25350 invoked by uid 500); 6 Jan 2012 01:33:25 -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 25341 invoked by uid 99); 6 Jan 2012 01:33:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 01:33:25 +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; Fri, 06 Jan 2012 01:33:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 85DA923888E7 for ; Fri, 6 Jan 2012 01:32:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1227927 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/Leader.java src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java Date: Fri, 06 Jan 2012 01:32:59 -0000 To: commits@zookeeper.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120106013259.85DA923888E7@eris.apache.org> Author: phunt Date: Fri Jan 6 01:32:58 2012 New Revision: 1227927 URL: http://svn.apache.org/viewvc?rev=1227927&view=rev Log: ZOOKEEPER-1293. Remove unused readyToStart from Leader.java (Alex Shraer via phunt) Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1227927&r1=1227926&r2=1227927&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Fri Jan 6 01:32:58 2012 @@ -174,6 +174,8 @@ IMPROVEMENTS: ZOOKEEPER-1345. Add a .gitignore file with general exclusions and Eclipse project files excluded (Harsh J via phunt) + ZOOKEEPER-1293. Remove unused readyToStart from Leader.java + (Alex Shraer via phunt) Release 3.4.0 - Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1227927&r1=1227926&r2=1227927&view=diff ============================================================================== --- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original) +++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Fri Jan 6 01:32:58 2012 @@ -75,7 +75,7 @@ public class Leader { final QuorumPeer self; // the follower acceptor thread - LearnerCnxAcceptor cnxAcceptor; + volatile LearnerCnxAcceptor cnxAcceptor = null; // list of all the followers public final HashSet learners = @@ -280,7 +280,6 @@ public class Leader { long epoch = -1; boolean waitingForNewEpoch = true; - volatile boolean readyToStart = false; /** * This method is main function that is called to lead @@ -309,7 +308,6 @@ public class Leader { cnxAcceptor.setName("LearnerCnxAcceptor-" + ss.getLocalSocketAddress()); cnxAcceptor.start(); - readyToStart = true; long epoch = getEpochToPropose(self.getId(), self.getAcceptedEpoch()); zk.setZxid(ZxidUtils.makeZxid(epoch, 0)); Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java?rev=1227927&r1=1227926&r2=1227927&view=diff ============================================================================== --- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java (original) +++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java Fri Jan 6 01:32:58 2012 @@ -229,7 +229,6 @@ public class Zab1_0Test { FollowerMockThread f2 = new FollowerMockThread(2, leader, false); // things needed for waitForEpochAck to run (usually in leader.lead(), but we're not running leader here) - leader.readyToStart = true; leader.leaderStateSummary = new StateSummary(leader.self.getCurrentEpoch(), leader.zk.getLastProcessedZxid()); f1.start(); @@ -323,7 +322,7 @@ public class Zab1_0Test { leadThread = new LeadThread(leader); leadThread.start(); - while(!leader.readyToStart) { + while(leader.cnxAcceptor == null || !leader.cnxAcceptor.isAlive()) { Thread.sleep(20); }