Author: michim
Date: Wed Mar 12 22:57:11 2014
New Revision: 1576982
URL: http://svn.apache.org/r1576982
Log:
ZOOKEEPER-1638. Redundant zk.getZKDatabase().clear(); (neil bhakta via michim)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1576982&r1=1576981&r2=1576982&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Mar 12 22:57:11 2014
@@ -789,6 +789,8 @@ IMPROVEMENTS:
ZOOKEEPER-1440. Spurious log error messages when QuorumCnxManager is shutting
down (Jordan Zimmerman via michim)
+ ZOOKEEPER-1638. Redundant zk.getZKDatabase().clear(); (neil bhakta via michim)
+
headers
Release 3.4.0 -
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java?rev=1576982&r1=1576981&r2=1576982&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java Wed Mar
12 22:57:11 2014
@@ -334,8 +334,7 @@ public class Learner {
else if (qp.getType() == Leader.SNAP) {
LOG.info("Getting a snapshot from leader");
// The leader is going to dump the database
- // clear our own database and read
- zk.getZKDatabase().clear();
+ // db is clear as part of deserializeSnapshot()
zk.getZKDatabase().deserializeSnapshot(leaderIs);
String signature = leaderIs.readString("signature");
if (!signature.equals("BenWasHere")) {
|