You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2013/11/20 23:15:17 UTC
svn commit: r1543969 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
Author: erick
Date: Wed Nov 20 22:15:17 2013
New Revision: 1543969
URL: http://svn.apache.org/r1543969
Log:
SOLR-5208: Support for the setting of core.properties key/values at create-time on Collections API
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1543969&r1=1543968&r2=1543969&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Nov 20 22:15:17 2013
@@ -91,6 +91,9 @@ New Features
* SOLR-5456: Admin UI - Allow creating new Files (steffkes)
+* SOLR-5208: Support for the setting of core.properties key/values at create-time on
+ Collections API (Erick Erickson)
+
Bug Fixes
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1543969&r1=1543968&r2=1543969&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Wed Nov 20 22:15:17 2013
@@ -111,6 +111,7 @@ public class OverseerCollectionProcessor
public static final String COLL_CONF = "collection.configName";
+ public static final String COLL_PROP_PREFIX = "property.";
public static final Map<String,Object> COLL_PROPS = ZkNodeProps.makeMap(
ROUTER, DocRouter.DEFAULT_NAME,
@@ -545,6 +546,7 @@ public class OverseerCollectionProcessor
params.set(CoreAdminParams.COLLECTION, collectionName);
params.set(CoreAdminParams.SHARD, sliceName);
params.set(ZkStateReader.NUM_SHARDS_PROP, numSlices);
+ addPropertyParams(message, params);
ShardRequest sreq = new ShardRequest();
params.set("qt", adminPath);
@@ -739,7 +741,7 @@ public class OverseerCollectionProcessor
params.set(CoreAdminParams.SHARD_RANGE, subRange.toString());
params.set(CoreAdminParams.SHARD_STATE, Slice.CONSTRUCTION);
params.set(CoreAdminParams.SHARD_PARENT, parentSlice.getName());
-
+ addPropertyParams(message, params);
sendShardRequest(nodeName, params);
}
@@ -849,6 +851,7 @@ public class OverseerCollectionProcessor
params.set(CoreAdminParams.NAME, shardName);
params.set(CoreAdminParams.COLLECTION, collectionName);
params.set(CoreAdminParams.SHARD, sliceName);
+ addPropertyParams(message, params);
// TODO: Figure the config used by the parent shard and use it.
//params.set("collection.configName", configName);
@@ -1287,6 +1290,14 @@ public class OverseerCollectionProcessor
shardHandler.submit(sreq, replica, sreq.params);
}
+ private void addPropertyParams(ZkNodeProps message, ModifiableSolrParams params) {
+ // Now add the property.key=value pairs
+ for (String key : message.keySet()) {
+ if (key.indexOf(COLL_PROP_PREFIX) != -1) {
+ params.set(key, message.getStr(key));
+ }
+ }
+ }
private void createCollection(ClusterState clusterState, ZkNodeProps message, NamedList results) throws KeeperException, InterruptedException {
String collectionName = message.getStr("name");
if (clusterState.getCollections().contains(collectionName)) {
@@ -1401,6 +1412,7 @@ public class OverseerCollectionProcessor
params.set(CoreAdminParams.COLLECTION, collectionName);
params.set(CoreAdminParams.SHARD, sliceName);
params.set(ZkStateReader.NUM_SHARDS_PROP, numSlices);
+ addPropertyParams(message, params);
ShardRequest sreq = new ShardRequest();
params.set("qt", adminPath);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1543969&r1=1543968&r2=1543969&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Wed Nov 20 22:15:17 2013
@@ -318,6 +318,7 @@ public class CollectionsHandler extends
SHARDS_PROP,
"router.");
+ copyPropertiesIfNotNull(req.getParams(), props);
ZkNodeProps m = new ZkNodeProps(props);
handleResponse(OverseerCollectionProcessor.CREATECOLLECTION, m, rsp);
@@ -342,6 +343,7 @@ public class CollectionsHandler extends
Map<String, Object> map = makeMap(QUEUE_OPERATION, CREATESHARD);
copyIfNotNull(req.getParams(),map,COLLECTION_PROP, SHARD_ID_PROP, REPLICATION_FACTOR,CREATE_NODE_SET);
+ copyPropertiesIfNotNull(req.getParams(), map);
ZkNodeProps m = new ZkNodeProps(map);
handleResponse(CREATESHARD, m, rsp);
}
@@ -372,7 +374,18 @@ public class CollectionsHandler extends
}
}
-
+
+ private void copyPropertiesIfNotNull(SolrParams params, Map<String, Object> props) {
+ Iterator<String> iter = params.getParameterNamesIterator();
+ while (iter.hasNext()) {
+ String param = iter.next();
+ if (param.indexOf(OverseerCollectionProcessor.COLL_PROP_PREFIX) != -1) {
+ props.put(param, params.get(param));
+ }
+ }
+ }
+
+
private void handleDeleteShardAction(SolrQueryRequest req,
SolrQueryResponse rsp) throws InterruptedException, KeeperException {
log.info("Deleting Shard : " + req.getParamString());
@@ -420,6 +433,7 @@ public class CollectionsHandler extends
if (rangesStr != null) {
props.put(CoreAdminParams.RANGES, rangesStr);
}
+ copyPropertiesIfNotNull(req.getParams(), props);
ZkNodeProps m = new ZkNodeProps(props);