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 2013/10/09 10:19:45 UTC
svn commit: r1530523 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/ZkController.java
Author: shalin
Date: Wed Oct 9 08:19:44 2013
New Revision: 1530523
URL: http://svn.apache.org/r1530523
Log:
SOLR-5319: Remove unused and incorrect router name from Collection ZK nodes
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/ZkController.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=1530523&r1=1530522&r2=1530523&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Oct 9 08:19:44 2013
@@ -112,6 +112,9 @@ Other Changes
* SOLR-5264: Move methods for getting config information from
FieldMutatingUpdateProcessorFactory to NamedList. (Shawn Heisey)
+* SOLR-5319: Remove unused and incorrect router name from Collection ZK nodes.
+ (Jessica Cheng via shalin)
+
================== 4.5.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1530523&r1=1530522&r2=1530523&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Wed Oct 9 08:19:44 2013
@@ -1160,18 +1160,6 @@ public final class ZkController {
getConfName(collection, collectionPath, collectionProps);
}
- if (collectionProps.get(DocCollection.DOC_ROUTER) == null) {
- Object numShards = collectionProps.get(ZkStateReader.NUM_SHARDS_PROP);
- if (numShards == null) {
- numShards = System.getProperty(ZkStateReader.NUM_SHARDS_PROP);
- }
- if (numShards == null) {
- collectionProps.put(DocCollection.DOC_ROUTER, ZkNodeProps.makeMap("name",ImplicitDocRouter.NAME));
- } else {
- collectionProps.put(DocCollection.DOC_ROUTER, ZkNodeProps.makeMap("name", DocRouter.DEFAULT_NAME));
- }
- }
-
collectionProps.remove(ZkStateReader.NUM_SHARDS_PROP); // we don't put numShards in the collections properties
ZkNodeProps zkProps = new ZkNodeProps(collectionProps);