Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D9C9E10E01 for ; Fri, 31 Jan 2014 17:40:43 +0000 (UTC) Received: (qmail 99773 invoked by uid 500); 31 Jan 2014 17:40:43 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 99766 invoked by uid 99); 31 Jan 2014 17:40:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 17:40:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 17:40:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 67910238899C; Fri, 31 Jan 2014 17:40:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140131174022.67910238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"); } }