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

SOLR-8255: MiniSolrCloudCluster should use a thread-safe list to hold its child nodes 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1713457 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alan Woodward 2015-11-09 15:24:42 +00:00
parent ccfdb5dce2
commit 4921f13576
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -348,6 +348,9 @@ Bug Fixes
* SOLR-8223: Avoid accidentally swallowing OutOfMemoryError (in LeaderInitiatedRecoveryThread.java * SOLR-8223: Avoid accidentally swallowing OutOfMemoryError (in LeaderInitiatedRecoveryThread.java
or CoreContainer.java) (Mike Drob via Christine Poerschke) 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 Optimizations
---------------------- ----------------------

4
solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
View File

@ -26,11 +26,11 @@ import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@ -89,7 +89,7 @@ public class MiniSolrCloudCluster {
private final ZkTestServer zkServer; private final ZkTestServer zkServer;
private final boolean externalZkServer; private final boolean externalZkServer;
private final List<JettySolrRunner> jettys = new LinkedList<>(); private final List<JettySolrRunner> jettys = new CopyOnWriteArrayList<>();
private final Path baseDir; private final Path baseDir;
private final CloudSolrClient solrClient; private final CloudSolrClient solrClient;
private final JettyConfig jettyConfig; private final JettyConfig jettyConfig;