murblanc commented on code in PR #2039:
URL: https://github.com/apache/solr/pull/2039#discussion_r1410512078
##########
solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java:
##########
@@ -97,33 +101,30 @@ public void call(ClusterState clusterState, ZkNodeProps
message, NamedList<Objec
CollectionHandlingUtils.waitForNewShard(collectionName, sliceName,
ccc.getZkStateReader());
String async = message.getStr(ASYNC);
- ZkNodeProps addReplicasProps =
- new ZkNodeProps(
+ Map<String, Object> addReplicasProps =
+ Utils.makeMap(
COLLECTION_PROP,
- collectionName,
+ (Object) collectionName,
SHARD_ID_PROP,
sliceName,
- ZkStateReader.NRT_REPLICAS,
- String.valueOf(numReplicas.get(Replica.Type.NRT)),
- ZkStateReader.TLOG_REPLICAS,
- String.valueOf(numReplicas.get(Replica.Type.TLOG)),
- ZkStateReader.PULL_REPLICAS,
- String.valueOf(numReplicas.get(Replica.Type.PULL)),
CollectionHandlingUtils.CREATE_NODE_SET,
message.getStr(CollectionHandlingUtils.CREATE_NODE_SET),
CommonAdminParams.WAIT_FOR_FINAL_STATE,
Boolean.toString(waitForFinalState));
+ for (Replica.Type replicaType : numReplicas.keySet()) {
+ addReplicasProps.put(replicaType.numReplicasProperty,
numReplicas.get(replicaType));
+ }
- Map<String, Object> propertyParams = new HashMap<>();
- CollectionHandlingUtils.addPropertyParams(message, propertyParams);
- addReplicasProps = addReplicasProps.plus(propertyParams);
- if (async != null) addReplicasProps.getProperties().put(ASYNC, async);
+ CollectionHandlingUtils.addPropertyParams(message, addReplicasProps);
+ if (async != null) {
+ addReplicasProps.put(ASYNC, async);
+ }
final NamedList<Object> addResult = new NamedList<>();
try {
new AddReplicaCmd(ccc)
.addReplica(
clusterState,
- addReplicasProps,
+ new ZkNodeProps(addReplicasProps),
Review Comment:
Ok, never mind. I was thinking to try to avoid copying the
`addReplicasProps` map into a new `ZkNodeProps`, but the SolrCloud code in
general copies maps around all the time so likely requires a separate dedicated
effort to make things more efficient.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
