[lucene-solr] branch reference_impl_dev updated: @865 Threads almost finished lining up to the flute.

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 6413ad0  @865 Threads almost finished lining up to the flute.
6413ad0 is described below

commit 6413ad03a790c75e54c8f03d3e310d51fd946e87
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Sep 21 10:06:33 2020 -0500

    @865 Threads almost finished lining up to the flute.
---
 .../src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java  | 4 +---
 solr/test-framework/src/java/org/apache/solr/SolrTestCase.java       | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 02d719b..abf331d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -233,9 +233,7 @@ public class Http2SolrClient extends SolrClient {
         log.debug("Create Http2SolrClient with HTTP/1.1 transport");
       }
       SolrHttpClientTransportOverHTTP transport = new SolrHttpClientTransportOverHTTP(1);
-      transport.getHttpClient().setIdleTimeout(idleTimeout);
       httpClient = new HttpClient(transport, sslContextFactory);
-      if (builder.maxConnectionsPerHost != null) httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);
     } else {
       log.debug("Create Http2SolrClient with HTTP/2 transport");
       HTTP2Client http2client = new HTTP2Client();
@@ -245,7 +243,6 @@ public class Http2SolrClient extends SolrClient {
       http2client.setInputBufferSize(16384);
       HttpClientTransportOverHTTP2 transport = new HttpClientTransportOverHTTP2(http2client);
       httpClient = new SolrInternalHttpClient(transport, sslContextFactory);
-      if (builder.maxConnectionsPerHost != null) httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);
     }
 
     try {
@@ -260,6 +257,7 @@ public class Http2SolrClient extends SolrClient {
       httpClient.setStrictEventOrdering(strictEventOrdering);
       httpClient.setConnectBlocking(false);
       httpClient.setFollowRedirects(false);
+      if (builder.maxConnectionsPerHost != null) httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);
       httpClient.setMaxRequestsQueuedPerDestination(100000);
       httpClient.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, AGENT));
       httpClient.setIdleTimeout(idleTimeout);
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 ba3aba2..eb00157 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -185,11 +185,6 @@ public class SolrTestCase extends LuceneTestCase {
 
     System.setProperty("org.eclipse.jetty.util.log.class", "org.apache.logging.log4j.appserver.jetty.Log4j2Logger");
 
-    // we do this because threads can be finished, but waiting
-    // for an idle timeout or in a TERMINATED state, and we don't
-    // want to wait for them - in prod these threads are daemon
-    interruptThreadsOnTearDown("ParWork", false);
-
     if (!SysStats.getSysStats().isAlive()) {
       SysStats.reStartSysStats();
     }