You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/11/11 22:54:04 UTC
svn commit: r1408125 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Author: markrmiller
Date: Sun Nov 11 21:54:04 2012
New Revision: 1408125
URL: http://svn.apache.org/viewvc?rev=1408125&view=rev
Log:
SOLR-4055: Fix a thread safety issue with the Collections API that could cause actions to be targeted at the wrong SolrCores.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1408125&r1=1408124&r2=1408125&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Nov 11 21:54:04 2012
@@ -159,6 +159,10 @@ Bug Fixes
after shutdown has already occurred, leaving an IndexWriter that is not closed.
(Mark Miller)
+* SOLR-4055: Fix a thread safety issue with the Collections API that could
+ cause actions to be targeted at the wrong SolrCores.
+ (Raintung Li via Mark Miller)
+
Other Changes
----------------------
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=1408125&r1=1408124&r2=1408125&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 Sun Nov 11 21:54:04 2012
@@ -262,21 +262,24 @@ public class OverseerCollectionProcessor
for (Map.Entry<String,Replica> shardEntry : shardEntries) {
final ZkNodeProps node = shardEntry.getValue();
if (clusterState.liveNodesContain(node.getStr(ZkStateReader.NODE_NAME_PROP))) {
- params.set(CoreAdminParams.CORE, node.getStr(ZkStateReader.CORE_NAME_PROP));
-
- String replica = node.getStr(ZkStateReader.BASE_URL_PROP);
- ShardRequest sreq = new ShardRequest();
- // yes, they must use same admin handler path everywhere...
- params.set("qt", adminPath);
-
- sreq.purpose = 1;
- // TODO: this sucks
- if (replica.startsWith("http://")) replica = replica.substring(7);
- sreq.shards = new String[] {replica};
- sreq.actualShards = sreq.shards;
- sreq.params = params;
- log.info("Collection Admin sending CoreAdmin cmd to " + replica);
- shardHandler.submit(sreq, replica, sreq.params);
+ //For thread safety, only simple clone the ModifiableSolrParams
+ ModifiableSolrParams cloneParams = new ModifiableSolrParams();
+ cloneParams.add(params);
+ cloneParams.set(CoreAdminParams.CORE, node.getStr(ZkStateReader.CORE_NAME_PROP));
+
+ String replica = node.getStr(ZkStateReader.BASE_URL_PROP);
+ ShardRequest sreq = new ShardRequest();
+
+ // yes, they must use same admin handler path everywhere...
+ cloneParams.set("qt", adminPath);
+ sreq.purpose = 1;
+ // TODO: this sucks
+ if (replica.startsWith("http://")) replica = replica.substring(7);
+ sreq.shards = new String[] {replica};
+ sreq.actualShards = sreq.shards;
+ sreq.params = cloneParams;
+ log.info("Collection Admin sending CoreAdmin cmd to " + replica + " params:" + sreq.params);
+ shardHandler.submit(sreq, replica, sreq.params);
}
}
}