[lucene-solr] 01/01: @264 Just work around for a bit.

[ma...@apache.org]

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

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

commit 9a3ff4d5a61fe8dd870e1ff8a11dcb4059580eae
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 20 20:37:19 2020 -0500

    @264 Just work around for a bit.
---
 solr/test-framework/src/java/org/apache/solr/SolrTestCase.java   | 8 +++++---
 solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index ec66f4d..4c9bc72 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -492,15 +492,16 @@ public class SolrTestCase extends LuceneTestCase {
     System.out.println("DO FORCED INTTERUPTS");
     //  we need to filter and only do this for known threads? dont want users to count on this behavior unless necessary
     String testThread = Thread.currentThread().getName();
-    //System.out.println("test thread:" + testThread);
+    System.out.println("test thread:" + testThread);
     ThreadGroup tg = Thread.currentThread().getThreadGroup();
-    //System.out.println("test group:" + tg.getName());
+    System.out.println("test group:" + tg.getName());
     Set<Map.Entry<Thread,StackTraceElement[]>> threadSet = Thread.getAllStackTraces().entrySet();
-    //System.out.println("thread count: " + threadSet.size());
+    System.out.println("thread count: " + threadSet.size());
     for (Map.Entry<Thread,StackTraceElement[]> threadEntry : threadSet) {
       Thread thread = threadEntry.getKey();
       ThreadGroup threadGroup = thread.getThreadGroup();
       if (threadGroup != null) {
+        System.out.println("thread is " + thread.getName());
         if (threadGroup.getName().equals(tg.getName()) && !thread.getName().startsWith("SUITE") && !thread.getName().startsWith("Log4j2")) {
           interrupt(thread, nameContains);
           continue;
@@ -510,6 +511,7 @@ public class SolrTestCase extends LuceneTestCase {
       while (threadGroup != null && threadGroup.getParent() != null && !thread.getName().startsWith("SUITE") && !thread.getName().startsWith("Log4j2")) {
         threadGroup = threadGroup.getParent();
         if (threadGroup.getName().equals(tg.getName())) {
+          System.out.println("thread is " + thread.getName());
           interrupt(thread, nameContains);
           continue;
         }
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 8651a38..4775fe4 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -2960,6 +2960,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
           qtp.setStopTimeout((int) TimeUnit.SECONDS.toMillis(30));
           qtp.setReservedThreads(-1); // -1 auto sizes, important to keep
           // qtp.setStopTimeout((int) TimeUnit.MINUTES.toMillis(1));
+          interruptThreadsOnTearDown("ParWork", false);
     return qtp;
   }
 }