You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/02/14 17:59:28 UTC

svn commit: r1568353 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/cloud/ZkController.java

Author: markrmiller
Date: Fri Feb 14 16:59:28 2014
New Revision: 1568353

URL: http://svn.apache.org/r1568353
Log:
SOLR-5731: In ConnectionManager, we should catch and only log exceptions from BeforeReconnect.

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=1568353&r1=1568352&r2=1568353&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Feb 14 16:59:28 2014
@@ -330,6 +330,9 @@ Bug Fixes
 
 * SOLR-5721: ConnectionManager can become stuck in likeExpired.
   (Gregory Chanan via Mark Miller)
+  
+* SOLR-5731: In ConnectionManager, we should catch and only log exceptions
+  from BeforeReconnect. (Mark Miller)
 
 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=1568353&r1=1568352&r2=1568353&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 Fri Feb 14 16:59:28 2014
@@ -198,7 +198,6 @@ public final class ZkController {
           @Override
           public void command() {
             try {
-              markAllAsNotLeader(registerOnReconnect);
               
               // this is troublesome - we dont want to kill anything the old
               // leader accepted
@@ -269,6 +268,7 @@ public final class ZkController {
             } catch (Exception e) {
               log.error("Error trying to stop any Overseer threads", e);
             }
+            markAllAsNotLeader(registerOnReconnect);
           }
         });