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 21:17:01 UTC
svn commit: r1683849 - in /zookeeper/branches/branch-3.5: ./
src/java/main/org/apache/zookeeper/server/quorum/
Author: rgs
Date: Fri Jun 5 19:17:01 2015
New Revision: 1683849
URL: http://svn.apache.org/r1683849
Log:
ZOOKEEPER-2207: Enhance error logs with LearnerHandler.packetToString()
(Hitoshi Mitake via rgs)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1683849&r1=1683848&r2=1683849&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Fri Jun 5 19:17:01 2015
@@ -175,6 +175,9 @@ IMPROVEMENTS:
ZOOKEEPER-2206: Add missing packet types to LearnerHandler.packetToString()
(Hitoshi Mitake via rgs)
+ ZOOKEEPER-2207: Enhance error logs with LearnerHandler.packetToString()
+ (Hitoshi Mitake via rgs)
+
Release 3.5.0 - 8/4/2014
NEW FEATURES:
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java?rev=1683849&r1=1683848&r2=1683849&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java Fri Jun 5 19:17:01 2015
@@ -165,7 +165,7 @@ public class Follower extends Learner{
fzk.sync();
break;
default:
- LOG.warn("unknown type " + qp.getType());
+ LOG.warn("Unknown packet type: {}", LearnerHandler.packetToString(qp));
break;
}
}
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Learner.java?rev=1683849&r1=1683848&r2=1683849&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Learner.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Learner.java Fri Jun 5 19:17:01 2015
@@ -389,8 +389,8 @@ public class Learner {
}
else {
- LOG.error("Got unexpected packet from leader "
- + qp.getType() + " exiting ... " );
+ LOG.error("Got unexpected packet from leader: {}, exiting ... ",
+ LearnerHandler.packetToString(qp));
System.exit(13);
}
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java?rev=1683849&r1=1683848&r2=1683849&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java Fri Jun 5 19:17:01 2015
@@ -481,7 +481,8 @@ public class LearnerHandler extends ZooK
qp = new QuorumPacket();
ia.readRecord(qp, "packet");
if(qp.getType() != Leader.ACK){
- LOG.error("Next packet was supposed to be an ACK");
+ LOG.error("Next packet was supposed to be an ACK,"
+ + " but received packet: {}", packetToString(qp));
return;
}