[lucene-solr] 11/26: @894 Work on some new problems.

[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

commit 183d0f660caea88c9d2541a58f9ad93a8082e09f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 1 11:59:17 2020 -0500

    @894 Work on some new problems.
---
 .../org/apache/solr/handler/component/HttpShardHandlerFactory.java  | 6 ++----
 solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java        | 2 +-
 solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java   | 2 +-
 .../src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java | 4 +---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index d92f8a4..cec2ebe 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -299,9 +299,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
     if (loadbalancer != null) {
       IOUtils.closeQuietly(loadbalancer);
     }
-    if (defaultClient != null) {
-      defaultClient.close();
-    }
+
     try {
       SolrMetricProducer.super.close();
     } catch (Exception e) {
@@ -310,7 +308,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
   }
 
   public void setHttp2Client(Http2SolrClient solrClient) {
-    this.defaultClient = new Http2SolrClient.Builder().withHttpClient(solrClient).build();
+    this.defaultClient = solrClient;
   }
 
     @Override
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index fbd0977..d824d33 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -736,7 +736,7 @@ public class HttpSolrCall {
       try {
         proxyRequest = solrDispatchFilter.httpClient.newRequest(url.toURI())
                 .method(req.getMethod())
-                .version(HttpVersion.HTTP_2);
+                .version(HttpVersion.fromString(req.getProtocol()));
       } catch(IllegalArgumentException e) {
         log.error("Error parsing URI for proxying " + url, e);
         throw new SolrException(ErrorCode.SERVER_ERROR, e);
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index cf15521..300b069 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -103,7 +103,7 @@ public class UpdateShardHandler implements SolrInfoBean {
     if (cfg != null) {
       updateOnlyClientBuilder
           .connectionTimeout(cfg.getDistributedConnectionTimeout())
-          .maxOutstandingAsyncRequests(-1)
+          .maxOutstandingAsyncRequests(1000)
           .maxThreadPoolSize(256)
           .idleTimeout(cfg.getDistributedSocketTimeout());
     }
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 d02daaf..a553fab 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
@@ -276,9 +276,7 @@ public class Http2SolrClient extends SolrClient {
   public void close() {
     assert closeTracker.close();
     asyncTracker.close();
-
-    ExecutorUtil.shutdownAndAwaitTermination(asyncResponseExec);
-
+    
     if (closeClient) {
       try {
         httpClient.stop();