You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2012/07/29 07:06:51 UTC
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
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");