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/01/31 18:39:04 UTC
svn commit: r1563189 - in /lucene/dev/trunk/solr: CHANGES.txt
solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Author: markrmiller
Date: Fri Jan 31 17:39:03 2014
New Revision: 1563189
URL: http://svn.apache.org/r1563189
Log:
SOLR-5676: SolrCloud updates rejected if talking to secure ZooKeeper.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1563189&r1=1563188&r2=1563189&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Jan 31 17:39:03 2014
@@ -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
----------------------
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1563189&r1=1563188&r2=1563189&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Fri Jan 31 17:39:03 2014
@@ -195,8 +195,8 @@ public class ConnectionManager implement
log.info("zkClient has disconnected");
disconnected();
connectionStrategy.disconnected();
- } else {
- disconnected();
+ } else if (state == KeeperState.AuthFailed) {
+ log.warn("zkClient received AuthFailed");
}
}