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 46CB210968 for ; Tue, 1 Apr 2014 01:46:22 +0000 (UTC) Received: (qmail 79172 invoked by uid 500); 1 Apr 2014 01:46:19 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 79132 invoked by uid 500); 1 Apr 2014 01:46:18 -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 79114 invoked by uid 99); 1 Apr 2014 01:46:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 01:46:17 +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; Tue, 01 Apr 2014 01:46:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9C19323889FD; Tue, 1 Apr 2014 01:45:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1583509 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Date: Tue, 01 Apr 2014 01:45:52 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140401014552.9C19323889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Tue Apr 1 01:45:52 2014 New Revision: 1583509 URL: http://svn.apache.org/r1583509 Log: ZOOKEEPER-1701. When new and old config have the same version, no need to write new config to disk or create new connections (Alexander Shraer via michim) Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1583509&r1=1583508&r2=1583509&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Tue Apr 1 01:45:52 2014 @@ -829,6 +829,10 @@ IMPROVEMENTS: ZOOKEEPER-1728. Better error message when reconfig invoked in standalone mode (Alexander Shraer via michim) + ZOOKEEPER-1701. When new and old config have the same version, no need to + write new config to disk or create new connections (Alexander Shraer via + michim) + headers Release 3.4.0 - Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java?rev=1583509&r1=1583508&r2=1583509&view=diff ============================================================================== --- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java (original) +++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Tue Apr 1 01:45:52 2014 @@ -1267,11 +1267,17 @@ public class QuorumPeer extends ZooKeepe } public synchronized void setLastSeenQuorumVerifier(QuorumVerifier qv, boolean writeToDisk){ - if (lastSeenQuorumVerifier!=null && lastSeenQuorumVerifier.getVersion() >= qv.getVersion()) { - LOG.warn("setLastSeenQuorumVerifier called with stale config " + qv.getVersion() + + if (lastSeenQuorumVerifier!=null && lastSeenQuorumVerifier.getVersion() > qv.getVersion()) { + LOG.error("setLastSeenQuorumVerifier called with stale config " + qv.getVersion() + ". Current version: " + quorumVerifier.getVersion()); } + // assuming that a version uniquely identifies a configuration, so if + // version is the same, nothing to do here. + if (lastSeenQuorumVerifier != null && + lastSeenQuorumVerifier.getVersion() == qv.getVersion()) { + return; + } lastSeenQuorumVerifier = qv; connectNewPeers(); if (writeToDisk) {