You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/12/07 09:57:31 UTC
[16/37] lucene-solr:jira/http2: SOLR-12801: Wait for thread on close
and add AwaitsFix annotation - most of these sim tests can fail to elect
shard leaders.
SOLR-12801: Wait for thread on close and add AwaitsFix annotation - most of these sim tests can fail to elect shard leaders.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e14432ef
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e14432ef
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e14432ef
Branch: refs/heads/jira/http2
Commit: e14432efd8dda81c86cba557255652cfaa377a28
Parents: e3cbdd0
Author: markrmiller <ma...@apache.org>
Authored: Mon Dec 3 17:40:28 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Mon Dec 3 17:40:51 2018 -0600
----------------------------------------------------------------------
.../org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java | 5 +++++
.../solr/cloud/autoscaling/sim/TestSimExtremeIndexing.java | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e14432ef/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
index 9a6b73f..a6d76c8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
@@ -889,6 +889,11 @@ public class SimCloudManager implements SolrCloudManager {
IOUtils.closeQuietly(stateManager);
triggerThread.interrupt();
IOUtils.closeQuietly(triggerThread);
+ try {
+ triggerThread.join();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
IOUtils.closeQuietly(objectCache);
simCloudManagerPool.shutdownNow();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e14432ef/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExtremeIndexing.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExtremeIndexing.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExtremeIndexing.java
index a99b91c..6c5f9e6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExtremeIndexing.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExtremeIndexing.java
@@ -22,6 +22,8 @@ import java.util.Locale;
import java.util.concurrent.TimeUnit;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
+
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -50,6 +52,7 @@ import static org.apache.solr.cloud.autoscaling.AutoScalingHandlerTest.createAut
@TimeoutSuite(millis = 48 * 3600 * 1000)
@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG;org.apache.solr.cloud.autoscaling.NodeLostTrigger=INFO;org.apache.client.solrj.cloud.autoscaling=DEBUG;org.apache.solr.cloud.autoscaling.ComputePlanAction=INFO;org.apache.solr.cloud.autoscaling.ExecutePlanAction=DEBUG;org.apache.solr.cloud.autoscaling.ScheduledTriggers=DEBUG")
//@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG;org.apache.solr.cloud.autoscaling.NodeLostTrigger=INFO;org.apache.client.solrj.cloud.autoscaling=DEBUG;org.apache.solr.cloud.CloudTestUtils=TRACE")
+@AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // this test can fail to elect a leader, seems to be common among sim tests
public class TestSimExtremeIndexing extends SimSolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());