Author: michim
Date: Wed Apr 16 07:06:54 2014
New Revision: 1587818
URL: http://svn.apache.org/r1587818
Log:
ZOOKEEPER-1840. Server tries to connect to itself during dynamic reconfig (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=1587818&r1=1587817&r2=1587818&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Apr 16 07:06:54 2014
@@ -608,6 +608,9 @@ BUGFIXES:
the same port for leader in two different tests. The second test periodically
fails complaining that the port is still in use. (Alexander Shraer via michim)
+ ZOOKEEPER-1840. Server tries to connect to itself during dynamic reconfig
+ (Alexander Shraer via michim)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
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=1587818&r1=1587817&r2=1587818&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 Wed Apr
16 07:06:54 2014
@@ -1252,7 +1252,7 @@ public class QuorumPeer extends ZooKeepe
if (qcm!=null && getQuorumVerifier()!=null && getLastSeenQuorumVerifier()!=null)
{
Map<Long, QuorumServer> committedView = getQuorumVerifier().getAllMembers();
for (Entry<Long, QuorumServer> e: getLastSeenQuorumVerifier().getAllMembers().entrySet()){
- if (!committedView.containsKey(e.getKey()))
+ if (e.getKey() != getId() && !committedView.containsKey(e.getKey()))
qcm.connectOne(e.getKey(), e.getValue().electionAddr);
}
}
|