#161- Add a timeout toe SolrQueuedThreadPool.

apache · Jul 15, 2020 · cbf2e16 · cbf2e16
1 parent 738556b
commit cbf2e16
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SolrQueuedThreadPool.java b/solr/solrj/src/java/org/apache/solr/common/util/SolrQueuedThreadPool.java
@@ -18,6 +18,7 @@
 
 import java.io.Closeable;
 import java.lang.invoke.MethodHandles;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.solr.common.util.ObjectReleaseTracker;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
@@ -67,7 +68,11 @@ protected void runJob(Runnable job) {
 //    }
 
     public void close() {
+        TimeOut timeout = new TimeOut(5, TimeUnit.SECONDS, TimeSource.NANO_TIME);
         while (getBusyThreads() != 0) {
+            if (timeout.hasTimedOut()) {
+                throw new RuntimeException("Timed out waiting for SolrQueuedThreadPool to close");
+            }
             try {
                 synchronized (notify) {
                     notify.wait(500);