From c0ae2fa0c1178a244c392c70a7380e438d5c98de Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Fri, 31 Jan 2014 17:39:03 +0000 Subject: [PATCH] SOLR-5676: SolrCloud updates rejected if talking to secure ZooKeeper. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1563189 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 +++ .../java/org/apache/solr/common/cloud/ConnectionManager.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 5f171b72fd6..bfb517c3299 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -244,6 +244,9 @@ Bug Fixes * SOLR-5673: HTTPSolrServer doesn't set own property correctly in setFollowRedirects. (Frank Wesemann via shalin) +* SOLR-5676: SolrCloud updates rejected if talking to secure ZooKeeper. + (Greg Chanan via Mark Miller) + Optimizations ---------------------- diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java index d09660cb5c0..0ac1d3937e2 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java @@ -195,8 +195,8 @@ public class ConnectionManager implements Watcher { log.info("zkClient has disconnected"); disconnected(); connectionStrategy.disconnected(); - } else { - disconnected(); + } else if (state == KeeperState.AuthFailed) { + log.warn("zkClient received AuthFailed"); } }