ZOOKEEPER-4352

Author: Asmoday

zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerHandler.java

@@ -865,15 +865,17 @@ boolean syncFollower(long peerLastZxid, LearnerMaster learnerMaster) {
                 currentZxid = maxCommittedLog;
                 needOpPacket = false;
                 needSnap = false;
-            } else if ((maxCommittedLog >= peerLastZxid) && (minCommittedLog <= peerLastZxid)) {
+            } else if ((maxCommittedLog >= peerLastZxid) && (minCommittedLog <= peerLastZxid) && (minCommittedLog > 0)) {
                 // Follower is within commitLog range
                 LOG.info("Using committedLog for peer sid: {}", getSid());
                 Iterator<Proposal> itr = db.getCommittedLog().iterator();
                 currentZxid = queueCommittedProposals(itr, peerLastZxid, null, maxCommittedLog);
                 needSnap = false;
-            } else if (peerLastZxid < minCommittedLog && txnLogSyncEnabled) {
+            } else if (peerLastZxid <= minCommittedLog && txnLogSyncEnabled) {
                 // Use txnlog and committedLog to sync
-
+                LOG.info(
+                    "Use txnlog and committedLog to sync:{}. peerLastZxid={}, minCommittedLog={}",
+                    getSid(), peerLastZxid, minCommittedLog);
                 // Calculate sizeLimit that we allow to retrieve txnlog from disk
                 long sizeLimit = db.calculateTxnLogSizeLimit();
                 // This method can return empty iterator if the requested zxid