Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8359110BEA for ; Wed, 12 Mar 2014 22:57:36 +0000 (UTC) Received: (qmail 30406 invoked by uid 500); 12 Mar 2014 22:57:36 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 30349 invoked by uid 500); 12 Mar 2014 22:57:35 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 30341 invoked by uid 99); 12 Mar 2014 22:57:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 22:57:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 22:57:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 41F6D2388ABC; Wed, 12 Mar 2014 22:57:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1576982 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/Learner.java Date: Wed, 12 Mar 2014 22:57:12 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140312225712.41F6D2388ABC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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")) {