You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/02/11 12:11:56 UTC
svn commit: r1567049 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/ZkController.java
Author: shalin
Date: Tue Feb 11 11:11:55 2014
New Revision: 1567049
URL: http://svn.apache.org/r1567049
Log:
SOLR-5689: On reconnect, ZkController cancels election on first context rather than latest
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1567049&r1=1567048&r2=1567049&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Feb 11 11:11:55 2014
@@ -316,6 +316,9 @@ Bug Fixes
to properly specify discountOverlap option.
(Isaac Hebsh, Ahmet Arslan, Vitaliy Zhovtyuk, hossman)
+* SOLR-5689: On reconnect, ZkController cancels election on first context rather
+ than latest. (Gregory Chanan, Mark Miller via shalin)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1567049&r1=1567048&r2=1567049&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Tue Feb 11 11:11:55 2014
@@ -222,7 +222,8 @@ public final class ZkController {
if (prevContext != null) {
prevContext.cancelElection();
}
-
+
+ overseerElector.setup(context);
overseerElector.joinElection(context, true);
zkStateReader.createClusterStateWatchersAndUpdate();