You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/06/05 20:44:25 UTC
svn commit: r1683838 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
Author: rgs
Date: Fri Jun 5 18:44:25 2015
New Revision: 1683838
URL: http://svn.apache.org/r1683838
Log:
ZOOKEEPER-2205: Log type of unexpected quorum packet in learner handler loop
(Hitoshi Mitake via rgs)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1683838&r1=1683837&r2=1683838&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Jun 5 18:44:25 2015
@@ -108,6 +108,9 @@ IMPROVEMENTS:
ZOOKEEPER-2124 Allow Zookeeper version string to have underscore '_'
(Chris Nauroth via michim)
+ ZOOKEEPER-2205: Log type of unexpected quorum packet in learner handler loop
+ (Hitoshi Mitake via rgs)
+
Release 3.4.6 - 2014-03-10
Backward compatible changes:
Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java?rev=1683838&r1=1683837&r2=1683838&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java Fri Jun 5 18:44:25 2015
@@ -230,8 +230,6 @@ public class LearnerHandler extends Thre
}
static public String packetToString(QuorumPacket p) {
- if (true)
- return null;
String type = null;
String mess = null;
Record txn = null;
@@ -626,6 +624,8 @@ public class LearnerHandler extends Thre
leader.zk.submitRequest(si);
break;
default:
+ LOG.warn("unexpected quorum packet, type: {}", packetToString(qp));
+ break;
}
}
} catch (IOException e) {