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

SOLR-8218: DistributedUpdateProcessor (initialCapacity) tweaks 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1712087 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christine Poerschke 2015-11-02 17:13:43 +00:00
parent e708c90466
commit fbc7ea4532
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -413,6 +413,9 @@ Other Changes
* SOLR-8221: MiniSolrCloudCluster should create subdirectories for its nodes * SOLR-8221: MiniSolrCloudCluster should create subdirectories for its nodes
(Alan Woodward) (Alan Woodward)
* SOLR-8218: DistributedUpdateProcessor (initialCapacity) tweaks
(Christine Poerschke)
================== 5.3.1 ================== ================== 5.3.1 ==================
Bug Fixes Bug Fixes

20
solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
View File

@ -527,7 +527,6 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
int hash = compositeIdRouter.sliceHash(id, doc, null, coll); int hash = compositeIdRouter.sliceHash(id, doc, null, coll);
for (DocRouter.Range range : ranges) { for (DocRouter.Range range : ranges) {
if (range.includes(hash)) { if (range.includes(hash)) {
if (nodes == null) nodes = new ArrayList<>();
DocCollection targetColl = cstate.getCollection(rule.getTargetCollectionName()); DocCollection targetColl = cstate.getCollection(rule.getTargetCollectionName());
Collection<Slice> activeSlices = targetColl.getRouter().getSearchSlicesSingle(id, null, targetColl); Collection<Slice> activeSlices = targetColl.getRouter().getSearchSlicesSingle(id, null, targetColl);
if (activeSlices == null || activeSlices.isEmpty()) { if (activeSlices == null || activeSlices.isEmpty()) {
@ -535,6 +534,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
"No active slices serving " + id + " found for target collection: " + rule.getTargetCollectionName()); "No active slices serving " + id + " found for target collection: " + rule.getTargetCollectionName());
} }
Replica targetLeader = cstate.getLeader(rule.getTargetCollectionName(), activeSlices.iterator().next().getName()); Replica targetLeader = cstate.getLeader(rule.getTargetCollectionName(), activeSlices.iterator().next().getName());
if (nodes == null) nodes = new ArrayList<>(1);
nodes.add(new StdNode(new ZkCoreNodeProps(targetLeader))); nodes.add(new StdNode(new ZkCoreNodeProps(targetLeader)));
break; break;
} }
@ -721,7 +721,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
cmdDistrib.distribAdd(cmd, Collections.singletonList(subShardLeader), params, true); cmdDistrib.distribAdd(cmd, Collections.singletonList(subShardLeader), params, true);
} }
} }
List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getHashableId(), cmd.getSolrInputDocument()); final List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getHashableId(), cmd.getSolrInputDocument());
if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) { if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) {
ModifiableSolrParams params = new ModifiableSolrParams(filterParams(req.getParams())); ModifiableSolrParams params = new ModifiableSolrParams(filterParams(req.getParams()));
params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString()); params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());
@ -756,7 +756,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
// TODO: what to do when no idField? // TODO: what to do when no idField?
if (returnVersions && rsp != null && idField != null) { if (returnVersions && rsp != null && idField != null) {
if (addsResponse == null) { if (addsResponse == null) {
addsResponse = new NamedList<String>(); addsResponse = new NamedList<String>(1);
rsp.add("adds",addsResponse); rsp.add("adds",addsResponse);
} }
if (scratch == null) scratch = new CharsRefBuilder(); if (scratch == null) scratch = new CharsRefBuilder();
@ -1151,7 +1151,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
cmdDistrib.distribDelete(cmd, subShardLeaders, params, true); cmdDistrib.distribDelete(cmd, subShardLeaders, params, true);
} }
List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getId(), null); final List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getId(), null);
if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) { if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) {
ModifiableSolrParams params = new ModifiableSolrParams(filterParams(req.getParams())); ModifiableSolrParams params = new ModifiableSolrParams(filterParams(req.getParams()));
params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString()); params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());
@ -1183,7 +1183,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
// TODO: what to do when no idField? // TODO: what to do when no idField?
if (returnVersions && rsp != null && cmd.getIndexedId() != null && idField != null) { if (returnVersions && rsp != null && cmd.getIndexedId() != null && idField != null) {
if (deleteResponse == null) { if (deleteResponse == null) {
deleteResponse = new NamedList<String>(); deleteResponse = new NamedList<String>(1);
rsp.add("deletes",deleteResponse); rsp.add("deletes",deleteResponse);
} }
if (scratch == null) scratch = new CharsRefBuilder(); if (scratch == null) scratch = new CharsRefBuilder();
@ -1323,7 +1323,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
List<ZkCoreNodeProps> replicaProps = zkController.getZkStateReader() List<ZkCoreNodeProps> replicaProps = zkController.getZkStateReader()
.getReplicaProps(collection, myShardId, leaderReplica.getName(), null, Replica.State.DOWN); .getReplicaProps(collection, myShardId, leaderReplica.getName(), null, Replica.State.DOWN);
if (replicaProps != null) { if (replicaProps != null) {
List<Node> myReplicas = new ArrayList<>(); final List<Node> myReplicas = new ArrayList<>(replicaProps.size());
for (ZkCoreNodeProps replicaProp : replicaProps) { for (ZkCoreNodeProps replicaProp : replicaProps) {
myReplicas.add(new StdNode(replicaProp, collection, myShardId)); myReplicas.add(new StdNode(replicaProp, collection, myShardId));
} }
@ -1341,7 +1341,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
if (subShardLeaders != null) { if (subShardLeaders != null) {
cmdDistrib.distribDelete(cmd, subShardLeaders, params, true); cmdDistrib.distribDelete(cmd, subShardLeaders, params, true);
} }
List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, null, null); final List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, null, null);
if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) { if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) {
params = new ModifiableSolrParams(filterParams(req.getParams())); params = new ModifiableSolrParams(filterParams(req.getParams()));
params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString()); params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());
@ -1365,7 +1365,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
if (returnVersions && rsp != null) { if (returnVersions && rsp != null) {
if (deleteByQueryResponse == null) { if (deleteByQueryResponse == null) {
deleteByQueryResponse = new NamedList<String>(); deleteByQueryResponse = new NamedList<String>(1);
rsp.add("deleteByQuery",deleteByQueryResponse); rsp.add("deleteByQuery",deleteByQueryResponse);
} }
deleteByQueryResponse.add(cmd.getQuery(), cmd.getVersion()); deleteByQueryResponse.add(cmd.getQuery(), cmd.getVersion());
@ -1637,12 +1637,12 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
private List<Node> getCollectionUrls(SolrQueryRequest req, String collection) { private List<Node> getCollectionUrls(SolrQueryRequest req, String collection) {
ClusterState clusterState = req.getCore().getCoreDescriptor() ClusterState clusterState = req.getCore().getCoreDescriptor()
.getCoreContainer().getZkController().getClusterState(); .getCoreContainer().getZkController().getClusterState();
List<Node> urls = new ArrayList<>();
Map<String,Slice> slices = clusterState.getSlicesMap(collection); Map<String,Slice> slices = clusterState.getSlicesMap(collection);
if (slices == null) { if (slices == null) {
throw new ZooKeeperException(ErrorCode.BAD_REQUEST, throw new ZooKeeperException(ErrorCode.BAD_REQUEST,
"Could not find collection in zk: " + clusterState); "Could not find collection in zk: " + clusterState);
} }
final List<Node> urls = new ArrayList<>(slices.size());
for (Map.Entry<String,Slice> sliceEntry : slices.entrySet()) { for (Map.Entry<String,Slice> sliceEntry : slices.entrySet()) {
Slice replicas = slices.get(sliceEntry.getKey()); Slice replicas = slices.get(sliceEntry.getKey());
@ -1655,7 +1655,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
} }
} }
} }
if (urls.size() == 0) { if (urls.isEmpty()) {
return null; return null;
} }
return urls; return urls;