You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/11/09 16:24:43 UTC
svn commit: r1713457 - in /lucene/dev/trunk/solr: CHANGES.txt
test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
Author: romseygeek
Date: Mon Nov 9 15:24:42 2015
New Revision: 1713457
URL: http://svn.apache.org/viewvc?rev=1713457&view=rev
Log:
SOLR-8255: MiniSolrCloudCluster should use a thread-safe list to hold its child nodes
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1713457&r1=1713456&r2=1713457&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Nov 9 15:24:42 2015
@@ -348,6 +348,9 @@ Bug Fixes
* SOLR-8223: Avoid accidentally swallowing OutOfMemoryError (in LeaderInitiatedRecoveryThread.java
or CoreContainer.java) (Mike Drob via Christine Poerschke)
+* SOLR-8255: MiniSolrCloudCluster needs to use a thread-safe list to keep track
+ of its child nodes (Alan Woodward)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java?rev=1713457&r1=1713456&r2=1713457&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java Mon Nov 9 15:24:42 2015
@@ -26,11 +26,11 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
@@ -89,7 +89,7 @@ public class MiniSolrCloudCluster {
private final ZkTestServer zkServer;
private final boolean externalZkServer;
- private final List<JettySolrRunner> jettys = new LinkedList<>();
+ private final List<JettySolrRunner> jettys = new CopyOnWriteArrayList<>();
private final Path baseDir;
private final CloudSolrClient solrClient;
private final JettyConfig jettyConfig;