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/08/22 03:28:05 UTC

svn commit: r1619645 - in /lucene/dev/branches/lucene_solr_4_10: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java

Author: markrmiller
Date: Fri Aug 22 01:28:05 2014
New Revision: 1619645

URL: http://svn.apache.org/r1619645
Log:
SOLR-6402: OverseerCollectionProcessor should not exit for ZooKeeper ConnectionLoss.

Modified:
    lucene/dev/branches/lucene_solr_4_10/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java

Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1619645&r1=1619644&r2=1619645&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Fri Aug 22 01:28:05 2014
@@ -231,6 +231,9 @@ Bug Fixes
   block cache are not removed, which is a problem with the global block cache option. 
   (Mark Miller, Patrick Hunt)
 
+* SOLR-6402: OverseerCollectionProcessor should not exit for ZooKeeper ConnectionLoss.
+  (Jessica Cheng via Mark Miller)
+
 Optimizations
 ---------------------
 

Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1619645&r1=1619644&r2=1619645&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Fri Aug 22 01:28:05 2014
@@ -342,8 +342,7 @@ public class OverseerCollectionProcessor
           }
 
         } catch (KeeperException e) {
-          if (e.code() == KeeperException.Code.SESSIONEXPIRED
-              || e.code() == KeeperException.Code.CONNECTIONLOSS) {
+          if (e.code() == KeeperException.Code.SESSIONEXPIRED) {
             log.warn("Overseer cannot talk to ZK");
             return;
           }