From 8154a8086a78c62f8a159f3eaa56547ecf832f85 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Fri, 22 Aug 2014 01:20:18 +0000 Subject: [PATCH] SOLR-6402: OverseerCollectionProcessor should not exit for ZooKeeper ConnectionLoss. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1619641 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 +++ .../org/apache/solr/cloud/OverseerCollectionProcessor.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index acd77d32c98..bd1ca18589d 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -338,6 +338,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 --------------------- diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java index c5cb83ddc59..96b1b5d5741 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java @@ -341,8 +341,7 @@ public class OverseerCollectionProcessor implements Runnable, Closeable { } } 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; }