lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1563192 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/solrj/ solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Date Fri, 31 Jan 2014 17:40:22 GMT
Author: markrmiller
Date: Fri Jan 31 17:40:21 2014
New Revision: 1563192

URL: http://svn.apache.org/r1563192
Log:
SOLR-5676: SolrCloud updates rejected if talking to secure ZooKeeper.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1563192&r1=1563191&r2=1563192&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Jan 31 17:40:21 2014
@@ -213,6 +213,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/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1563192&r1=1563191&r2=1563192&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
(original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Fri Jan 31 17:40:21 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");
     }
   }
 



Mime
View raw message