You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2018/02/26 04:10:23 UTC

lucene-solr:master: SOLR-12027: Increasing thread lingering to 80s

Repository: lucene-solr
Updated Branches:
  refs/heads/master b212f2e9b -> d3ef153b0


SOLR-12027: Increasing thread lingering to 80s

Sometimes Jetty can't stop for a minute. We need tests wait more than a minute in the worst case
to avoid test noise like ThreadLeakError: 1 thread leaked from SUITE scope.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d3ef153b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d3ef153b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d3ef153b

Branch: refs/heads/master
Commit: d3ef153b09461aa0bd2f735954905321d6b72aed
Parents: b212f2e
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Sun Feb 25 23:18:27 2018 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Sun Feb 25 23:18:27 2018 +0300

----------------------------------------------------------------------
 solr/CHANGES.txt                                                 | 2 ++
 solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3ef153b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5c0351e..c6a2dd0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -316,6 +316,8 @@ Other Changes
 
 * SOLR-12017: Remove BadApple and AwaitsFix annotations that link to closed JIRAs (Erick Erickson)
 
+* SOLR-12027: Increase thread lingering timeout to 80s. (Mikhail Khludnev)
+
 ==================  7.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3ef153b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 706f1eb..bef9519 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -64,6 +64,7 @@ import com.carrotsearch.randomizedtesting.RandomizedContext;
 import com.carrotsearch.randomizedtesting.RandomizedTest;
 import com.carrotsearch.randomizedtesting.TraceFormatting;
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
 import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
 import org.apache.commons.io.FileUtils;
 import org.apache.http.client.HttpClient;
@@ -159,6 +160,7 @@ import static org.apache.solr.update.processor.DistributingUpdateProcessorFactor
 @SuppressSysoutChecks(bugUrl = "Solr dumps tons of logs to console.")
 @SuppressFileSystems("ExtrasFS") // might be ok, the failures with e.g. nightly runs might be "normal"
 @RandomizeSSL()
+@ThreadLeakLingering(linger = 80000)
 public abstract class SolrTestCaseJ4 extends LuceneTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());