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/01/27 17:31:47 UTC
svn commit: r1236740 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
Author: markrmiller
Date: Fri Jan 27 16:31:47 2012
New Revision: 1236740
URL: http://svn.apache.org/viewvc?rev=1236740&view=rev
Log:
be more aggressive about trying to shut down executors in this test
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1236740&r1=1236739&r2=1236740&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Fri Jan 27 16:31:47 2012
@@ -146,7 +146,7 @@ public class OverseerTest extends SolrTe
SolrZkClient zkClient = null;
ZkStateReader reader = null;
final ZkController[] controllers = new ZkController[nodeCount];
-
+ final ExecutorService[] nodeExecutors = new ExecutorService[nodeCount];
try {
server.run();
AbstractZkTestCase.tryCleanSolrZkNode(server.getZkHost());
@@ -174,7 +174,6 @@ public class OverseerTest extends SolrTe
.getAbsolutePath());
- final ExecutorService[] nodeExecutors = new ExecutorService[nodeCount];
for (int i = 0; i < nodeCount; i++) {
nodeExecutors[i] = Executors.newFixedThreadPool(1);
}
@@ -289,6 +288,9 @@ public class OverseerTest extends SolrTe
controllers[i].close();
}
server.shutdown();
+ for (int i = 0; i < nodeCount; i++) {
+ nodeExecutors[i].shutdownNow();
+ }
}
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);