Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@locus.apache.org Received: (qmail 59759 invoked from network); 9 Sep 2008 17:56:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Sep 2008 17:56:40 -0000 Received: (qmail 62066 invoked by uid 500); 9 Sep 2008 17:56:38 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 62043 invoked by uid 500); 9 Sep 2008 17:56:38 -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 62030 invoked by uid 99); 9 Sep 2008 17:56:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 10:56:38 -0700 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; Tue, 09 Sep 2008 17:55:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0819D23889FC; Tue, 9 Sep 2008 10:56:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r693529 - in /hadoop/zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java Date: Tue, 09 Sep 2008 17:56:19 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080909175620.0819D23889FC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Tue Sep 9 10:56:19 2008 New Revision: 693529 URL: http://svn.apache.org/viewvc?rev=693529&view=rev Log: applied doc patch for ZOOKEEPER-118 Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=693529&r1=693528&r2=693529&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Tue Sep 9 10:56:19 2008 @@ -2,12 +2,14 @@ Non-backward compatible changes: - ZOOKEEPER-132: Create Enum to replace CreateFlag in ZooKepper.create method (Jakob Homan) + ZOOKEEPER-132. Create Enum to replace CreateFlag in ZooKepper.create method (Jakob Homan via phunt) Backward compatibile changes: BUGFIXES: + ZOOKEEPER-118. findbugs flagged switch statement in followerrequestprocessor.run() (Flavio Paiva Junqueira via phunt) + ZOOKEEPER-39. Use Watcher objects rather than boolean on read operations. (Andrew Kornev) Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java?rev=693529&r1=693528&r2=693529&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java Tue Sep 9 10:56:19 2008 @@ -64,6 +64,12 @@ // the request to the leader so that we are ready to receive // the response nextProcessor.processRequest(request); + + // We now ship the request to the leader. As with all + // other quorum operations, sync also follows this code + // path, but different from others, we need to keep track + // of the sync operations this follower has pending, so we + // add it to pendingSyncs. switch (request.type) { case OpCode.sync: zks.pendingSyncs.add(request);