You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/03/16 04:19:11 UTC
svn commit: r1577969 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Author: shalin
Date: Sun Mar 16 03:19:11 2014
New Revision: 1577969
URL: http://svn.apache.org/r1577969
Log:
SOLR-5867: OverseerCollectionProcessor isn't properly generating https urls in some cases
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/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.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=1577969&r1=1577968&r2=1577969&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sun Mar 16 03:19:11 2014
@@ -117,6 +117,9 @@ Bug Fixes
* SOLR-5861: Recovery should not set onlyIfLeaderActive=true for slice in 'recovery'
state. (shalin)
+* SOLR-5867: OverseerCollectionProcessor isn't properly generating https urls in some
+ cases. (Steve Davids via shalin)
+
Optimizations
----------------------
* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1577969&r1=1577968&r2=1577969&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Sun Mar 16 03:19:11 2014
@@ -349,7 +349,7 @@ public class OverseerCollectionProcessor
params.set("qt", adminPath);
ShardRequest sreq = new ShardRequest();
sreq.purpose = 1;
- String replica = nodeName.replaceFirst("_", "/");
+ String replica = zkStateReader.getBaseUrlForNodeName(nodeName);
sreq.shards = new String[]{replica};
sreq.actualShards = sreq.shards;
sreq.params = params;