Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 84740 invoked from network); 10 Mar 2010 18:53:06 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Mar 2010 18:53:06 -0000 Received: (qmail 79935 invoked by uid 500); 10 Mar 2010 18:52:35 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 79906 invoked by uid 500); 10 Mar 2010 18:52:35 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 79898 invoked by uid 99); 10 Mar 2010 18:52:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 18:52:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 10 Mar 2010 18:52:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9818D2388978; Wed, 10 Mar 2010 18:52:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r921509 - in /hadoop/zookeeper/trunk: ./ src/java/main/org/apache/zookeeper/server/quorum/ src/java/test/org/apache/zookeeper/test/ Date: Wed, 10 Mar 2010 18:52:11 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100310185211.9818D2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Wed Mar 10 18:52:11 2010 New Revision: 921509 URL: http://svn.apache.org/viewvc?rev=921509&view=rev Log: ZOOKEEPER-693. TestObserver stuck in tight notification loop in FLE Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=921509&r1=921508&r2=921509&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Wed Mar 10 18:52:11 2010 @@ -258,7 +258,11 @@ BUGFIXES: ZOOKEEPER-685. Race in LENonTerminateTest (henry via breed) - ZOOKEEPER-677. c client doesn't allow ipv6 numeric connect string (breed & phunt & mahadev via breed) + ZOOKEEPER-677. c client doesn't allow ipv6 numeric connect string + (breed & phunt & mahadev via breed) + + ZOOKEEPER-693. TestObserver stuck in tight notification loop in FLE + (flavio via phunt) IMPROVEMENTS: ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java?rev=921509&r1=921508&r2=921509&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java Wed Mar 10 18:52:11 2010 @@ -808,6 +808,17 @@ public class AuthFastLeaderElection impl } + /** + * There is nothing to shutdown in this implementation of + * leader election, so we simply have an empty method. + */ + public void shutdown(){} + + /** + * Invoked in QuorumPeer to find or elect a new leader. + * + * @throws InterruptedException + */ public Vote lookForLeader() throws InterruptedException { try { self.jmxLeaderElectionBean = new LeaderElectionBean(); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java?rev=921509&r1=921508&r2=921509&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java Wed Mar 10 18:52:11 2010 @@ -23,4 +23,5 @@ import org.apache.zookeeper.server.quoru public interface Election { public Vote lookForLeader() throws InterruptedException; + public void shutdown(); } \ No newline at end of file Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java?rev=921509&r1=921508&r2=921509&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java Wed Mar 10 18:52:11 2010 @@ -111,6 +111,17 @@ public class LeaderElection implements E return result; } + /** + * There is nothing to shutdown in this implementation of + * leader election, so we simply have an empty method. + */ + public void shutdown(){} + + /** + * Invoked in QuorumPeer to find or elect a new leader. + * + * @throws InterruptedException + */ public Vote lookForLeader() throws InterruptedException { try { self.jmxLeaderElectionBean = new LeaderElectionBean(); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java?rev=921509&r1=921508&r2=921509&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Wed Mar 10 18:52:11 2010 @@ -670,6 +670,10 @@ public class QuorumPeer extends Thread i if(udpSocket != null) { udpSocket.close(); } + + if(getElectionAlg() != null){ + getElectionAlg().shutdown(); + } } /** Modified: hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java?rev=921509&r1=921508&r2=921509&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java (original) +++ hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java Wed Mar 10 18:52:11 2010 @@ -155,7 +155,7 @@ public class ObserverTest extends Quorum lastEvent.getState() + ")", (KeeperState.SyncConnected==lastEvent.getState() || KeeperState.Expired==lastEvent.getState())); - + q1.shutdown(); q2.shutdown(); q3.shutdown();