SOLR-5689: On reconnect, ZkController cancels election on first context rather than latest

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1567049 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -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
 ----------------------
 

solr/core/src/java/org/apache/solr/cloud/ZkController.java

@@ -222,7 +222,8 @@ public final class ZkController {
               if (prevContext != null) {
                 prevContext.cancelElection();
               }
-              
+
+              overseerElector.setup(context);
               overseerElector.joinElection(context, true);
               zkStateReader.createClusterStateWatchersAndUpdate();