Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5319: Remove unused and incorrect router name from Collection ZK nodes 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1530521 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2013-10-09 08:18:46 +00:00
parent e408affd6a
commit 924865bf4a
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -144,6 +144,9 @@ Other Changes
* SOLR-5264: Move methods for getting config information from * SOLR-5264: Move methods for getting config information from
FieldMutatingUpdateProcessorFactory to NamedList. (Shawn Heisey) FieldMutatingUpdateProcessorFactory to NamedList. (Shawn Heisey)
* SOLR-5319: Remove unused and incorrect router name from Collection ZK nodes.
(Jessica Cheng via shalin)
================== 4.5.0 ================== ================== 4.5.0 ==================
Versions of Major Components Versions of Major Components

12
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -1160,18 +1160,6 @@ public final class ZkController {
getConfName(collection, collectionPath, collectionProps); 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 collectionProps.remove(ZkStateReader.NUM_SHARDS_PROP); // we don't put numShards in the collections properties
ZkNodeProps zkProps = new ZkNodeProps(collectionProps); ZkNodeProps zkProps = new ZkNodeProps(collectionProps);