From 6bc360ee67582e42c0211ac1767a9c0ed8bfaad3 Mon Sep 17 00:00:00 2001
From: Chris Hostetter <hossman@apache.org>
Date: Mon, 8 Apr 2019 10:57:02 -0700
Subject: [PATCH] BlockCacheTest uses BlockCache which uses the common
 ForkJoinPool so we need to ensure the SolrIgnoredThreadsFilter is used

---
 .../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 c6b8496556f..3a44673b3eb 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;