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 BDF0CD66C for ; Sun, 29 Jul 2012 05:07:43 +0000 (UTC) Received: (qmail 27743 invoked by uid 500); 29 Jul 2012 05:07:43 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 27600 invoked by uid 500); 29 Jul 2012 05:07:40 -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 27566 invoked by uid 99); 29 Jul 2012 05:07:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Jul 2012 05:07:39 +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; Sun, 29 Jul 2012 05:07:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DD5522388906 for ; Sun, 29 Jul 2012 05:06:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1366783 - in /zookeeper/branches/branch-3.3: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/Leader.java src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java Date: Sun, 29 Jul 2012 05:06:51 -0000 To: commits@zookeeper.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120729050651.DD5522388906@eris.apache.org> Author: phunt Date: Sun Jul 29 05:06:51 2012 New Revision: 1366783 URL: http://svn.apache.org/viewvc?rev=1366783&view=rev Log: ZOOKEEPER-1521. LearnerHandler initLimit/syncLimit problems specifying follower socket timeout limits (phunt) Modified: zookeeper/branches/branch-3.3/CHANGES.txt zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java Modified: zookeeper/branches/branch-3.3/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1366783&r1=1366782&r2=1366783&view=diff ============================================================================== --- zookeeper/branches/branch-3.3/CHANGES.txt (original) +++ zookeeper/branches/branch-3.3/CHANGES.txt Sun Jul 29 05:06:51 2012 @@ -30,6 +30,9 @@ BUGFIXES: ZOOKEEPER-1489. Data loss after truncate on transaction log (phunt) + ZOOKEEPER-1521. LearnerHandler initLimit/syncLimit problems + specifying follower socket timeout limits (phunt) + IMPROVEMENTS: ZOOKEEPER-1454. Document how to run autoreconf if cppunit is Modified: zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1366783&r1=1366782&r2=1366783&view=diff ============================================================================== --- zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original) +++ zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Sun Jul 29 05:06:51 2012 @@ -236,8 +236,10 @@ public class Leader { try { while (!stop) { try{ - Socket s = ss.accept(); - s.setSoTimeout(self.tickTime * self.syncLimit); + Socket s = ss.accept(); + // start with the initLimit, once the ack is processed + // in LearnerHandler switch to the syncLimit + s.setSoTimeout(self.tickTime * self.initLimit); s.setTcpNoDelay(nodelay); LearnerHandler fh = new LearnerHandler(s, Leader.this); fh.start(); Modified: zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java?rev=1366783&r1=1366782&r2=1366783&view=diff ============================================================================== --- zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java (original) +++ zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java Sun Jul 29 05:06:51 2012 @@ -399,6 +399,9 @@ public class LearnerHandler extends Thre } leader.processAck(this.sid, qp.getZxid(), sock.getLocalSocketAddress()); + // now that the ack has been processed expect the syncLimit + sock.setSoTimeout(leader.self.tickTime * leader.self.syncLimit); + /* * Wait until leader starts up */ @@ -407,7 +410,7 @@ public class LearnerHandler extends Thre leader.zk.wait(500); } } - + while (true) { qp = new QuorumPacket(); ia.readRecord(qp, "packet");