You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2019/04/08 17:59:57 UTC

[lucene-solr] branch branch_8x updated: BlockCacheTest uses BlockCache which uses the common ForkJoinPool so we need to ensure the SolrIgnoredThreadsFilter is used

This is an automated email from the ASF dual-hosted git repository.

hossman pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new ea2a91e  BlockCacheTest uses BlockCache which uses the common ForkJoinPool so we need to ensure the SolrIgnoredThreadsFilter is used
ea2a91e is described below

commit ea2a91ef1f876f1b7dd8d203ba76aea39b0ee596
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Mon Apr 8 10:57:02 2019 -0700

    BlockCacheTest uses BlockCache which uses the common ForkJoinPool so we need to ensure the SolrIgnoredThreadsFilter is used
    
    (cherry picked from commit 6bc360ee67582e42c0211ac1767a9c0ed8bfaad3)
---
 .../org/apache/solr/store/blockcache/BlockCacheTest.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java b/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java
index c6b8496..3a44673 100644
--- a/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java
+++ b/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java
@@ -21,13 +21,25 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+
 import com.github.benmanes.caffeine.cache.*;
-import org.apache.lucene.util.LuceneTestCase;
+
+import org.apache.lucene.util.QuickPatchThreadsFilter;
+
+import org.apache.solr.SolrIgnoredThreadsFilter;
 import org.apache.solr.SolrTestCase;
+
 import org.junit.Test;
 
-@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 12-Jun-2018
+@ThreadLeakFilters(defaultFilters = true, filters = {
+    SolrIgnoredThreadsFilter.class,
+    QuickPatchThreadsFilter.class
+})
+@ThreadLeakLingering(linger = 10000)
 public class BlockCacheTest extends SolrTestCase {
+
   @Test
   public void testBlockCache() {
     int blocksInTest = 2000000;