SOLR-16503: Replace default USH apache client with Http2SolrClient #2741

iamsanjay · 2024-10-04T13:57:06Z

https://issues.apache.org/jira/browse/SOLR-16503

Replaced the default apache Http client provided by UpdateShardHandler with the Http2SolrClient provided by CoreContainer#getDefaultHttpSolrClient which will be introduced in #2689. As we are still deciding on what is the best way moving forward to set the url. Here, for now, almost everywhere a new Http2SolrClient is being re-created.

try (var solrClient =
          new Http2SolrClient.Builder(baseUrl)
              .withHttpClient(coreContainer.getDefaultHttpSolrClient())
              .build()) {
    // code goes here
}

Of course, If we decided to go with #2714 then setting up url and closing the instance would be replaced with a new abstraction.

var updateRsp = client.requestWithBaseUrl(url, (c) -> req.process(c))

Checklist

Please review the following and check all that apply:

I have reviewed the guidelines for How to Contribute and my code conforms to the standards described there to the best of my ability.
I have created a Jira issue and added the issue ID to my pull request title.
I have given Solr maintainers access to contribute to my PR branch. (optional but recommended, not available for branches on forks living under an organisation)
I have developed this patch against the main branch.
I have run ./gradlew check.
I have added tests for my changes.
I have added documentation for the Reference Guide

…lient

iamsanjay · 2024-10-05T05:25:49Z

SplitShardWithNodeRoleTest.testSolrClusterWithNodeRoleWithPull failed! Even in the past this one failed. If I look at the test, It seem simple, However the complexity that split operation involves is rather too much. This is how it runs.

Create a collection with one shard containing one NRT and one PULL replica.
waitForState to achieve above configuration
Index 10 documents
Commit collection
Perform split operation
waitForState for 2 active sub-shards (about 45 seconds, and this is where it failed.)

I am not sure If increasing Timeout will help us. But we can try it! In the logs, one can see that just before the assertion failed, the IndexFetcher was running. May be the PULL replicas were downloading the index, and the time finished and the sub-shard never really recovered.

Question: Do both NRT and PULL replicas need to be active for sub-shards to be active?

Note :- I found a JIRA ticked related to this one https://issues.apache.org/jira/browse/SOLR-16753.

solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java

solr/core/src/test/org/apache/solr/core/TestHttpSolrClientProvider.java

solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java

solr/core/src/java/org/apache/solr/pkg/PackageAPI.java

solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java

dsmiley · 2024-10-06T19:28:47Z

solr/core/src/java/org/apache/solr/cloud/Overseer.java

-            .withSocketTimeout(30000, TimeUnit.MILLISECONDS)
-            .withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
-            .withHttpClient(updateShardHandler.getDefaultHttpClient())
+            .withZkClientTimeout(30000, TimeUnit.MILLISECONDS)
+            .withZkConnectTimeout(15000, TimeUnit.MILLISECONDS)
+            .withHttpClient(getCoreContainer().getDefaultHttpSolrClient())


withSocketTimeout was on the HTTP connection at the LBHttpSolrClient layer not ZK one. The Http2/Jetty side doesn't quite work the same way. It creates an LBHttp2SolrClient without such customizations. Maybe they could bet set at the HttpClient (Jetty) layer, albeit this means you're not passing in AFAICT, there's no direct substitute for our Http2 builder; instead you'd have to create the Jetty HttpClient with those settings and then pass it in.

Aaaaanyway.... I don't think it's worth retaining such particulars here. I don't know why these specific timeouts were put here; they were added by @sigram in relation to ReindexCollection. I recommend we simply use the new getCoreContainer().getDefaultHttpSolrClient().

solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java

…Timeout

dsmiley · 2024-10-10T02:33:58Z

solr/core/src/java/org/apache/solr/cloud/Overseer.java

-            .withZkConnectTimeout(15000, TimeUnit.MILLISECONDS)
-            .withHttpClient(getCoreContainer().getDefaultHttpSolrClient())
-            .build()) {
+    try (var solrClient =


since this client is embedded into the Cloud one, I think you should name this var maybe internalClient or something and don't refer to it in the block of code for the try-finally except for passing into the CloudSolrClient.

BTW; it really is painful to customize these particular timeouts as we're forced to do it at an inner layer. Ugh. @epugh not sure if you worked on some of the SolrClient building methods and saw this issue before. Maybe we should add the same methods to the CloudHttp2SolrClient.Builder

dsmiley · 2024-10-10T02:38:50Z

solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java

-        var response = solrClient.requestWithBaseUrl(baseUrl, client -> client.request(request));
+        var response = solrClient.requestWithBaseUrl(baseUrl, request::process).getResponse();


This is rather nice. @gerlowskija, I think we can do away with the lambda-less requestWithBaseUrl I was suggesting. WDYT?

solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java

dsmiley · 2024-10-17T12:49:42Z

solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java

+
+      InputStream is = null;
+      var solrClient = coreContainer.getDefaultHttpSolrClient();
+
      try {
+        GenericSolrRequest request = new GenericSolrRequest(GET, "/node/files" + getMetaPath());
+        request.setResponseParser(new InputStreamResponseParser(null));
+        var response = solrClient.requestWithBaseUrl(baseUrl, request::process).getResponse();
+        is = (InputStream) response.get("stream");
        metadata =
-            Utils.executeGET(
-                coreContainer.getUpdateShardHandler().getDefaultHttpClient(),
-                baseUrl + "/node/files" + getMetaPath(),
-                Utils.newBytesConsumer((int) MAX_PKG_SIZE));
+            Utils.newBytesConsumer((int) MAX_PKG_SIZE).accept((InputStream) response.get("stream"));
        m = (Map<?, ?>) Utils.fromJSON(metadata.array(), metadata.arrayOffset(), metadata.limit());


Please replace needless use of the special InputStreamResponseParser with a standard JsonMapResponseParser. Perhaps don't even do that; we don't have to use JSON, I think; Solr will by default negotiate the format and get you a NamedList. (Map like thing).

dsmiley · 2024-10-17T12:55:57Z

solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java

+          var solrClient = coreContainer.getDefaultHttpSolrClient();
+          var resp = solrClient.requestWithBaseUrl(baseUrl, request::process).getResponse();
+
+          if (Utils.getObjectByPath(resp, false, Arrays.asList("files", path)) != null) {


there are convenience methods on NamedList avoiding the need to refer to this awkward utility method. Try findRecursive.

iamsanjay added 24 commits September 2, 2024 22:00

introducing new home for Default solr client

3f3a75e

format code

a4615d1

HttpSolrClientProvider for default http client

8062a1e

Merge branch 'main' into SOLR-16503_default_Http2SolrClient

0701cac

format code

f80d3d2

Deleted ServerSolrClientCache and related code

82a6255

Change return type to Http2SolrClient

05630c4

Merge branch 'main' into SOLR-16503_default_Http2SolrClient

a6489a7

refector ReindexCollectionCmd

ec1d9b5

Added test cases

ee0e888

Merge branch 'main' into SOLR-16503_default_Http2SolrClient

0da4466

tidy code

7729fd9

Revert default usage to http2 for now

f27a07f

Added override anotation for setup

c7e8ed9

Reverting TestCoreContainer

bebaf2d

Merge branch 'main' into SOLR-16503_default_Http2SolrClient

03386e4

Enabling option for maxUpdateConnectionsPerHost setting for default c…

6db8ee6

…lient

Change Closeable to AutoCloseable for broader resource management

212c65b

Merge branch 'main' into SOLR-16503_default_Http2SolrClient

59f700b

Added doc, chnaged names and return new Http2SolrClient

1695d1e

Merge branch 'main' into SOLR-16503_default_Http2SolrClient

c49b792

Added doc and changed method signature

f849ad0

Replace usage of default apache http client

dffd95c

tidy

76e9284

github-actions bot added client:solrj tests cat:cloud cat:index cat:api cat:security labels Oct 4, 2024

github-actions bot added the cat:packagemanager label Oct 4, 2024

iamsanjay changed the title ~~SOLR-16503: Replace default USH apache client with Jetty Http2SolrClient~~ SOLR-16503: Replace default USH apache client with Http2SolrClient Oct 4, 2024

iamsanjay added 2 commits October 5, 2024 17:23

Merge branch 'main' into replace_defaultClient_usage

04e17a3

Start using requestWithBaseUrl

7c160a5

dsmiley reviewed Oct 6, 2024

View reviewed changes

iamsanjay added 5 commits October 7, 2024 09:51

makes some changes to test

786cb6d

Merge branch 'main' into replace_defaultClient_usage

cdf2775

Add another assertion to make sure idleTimeout not set to defaultIdle…

9331bbf

…Timeout

gradlew check fix

6a6f536

replaced with method reference

acecf82

dsmiley reviewed Oct 10, 2024

View reviewed changes

dsmiley reviewed Oct 11, 2024

View reviewed changes

solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java Outdated Show resolved Hide resolved

solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java Outdated Show resolved Hide resolved

iamsanjay added 2 commits October 17, 2024 12:56

Merge branch 'main' into replace_defaultClient_usage

6dd2383

removed creation of http2SolrClient instead uses requestWithBaseUrl

3b432e6

github-actions bot removed client:solrj tests cat:index labels Oct 17, 2024

dsmiley reviewed Oct 17, 2024

View reviewed changes

iamsanjay added 3 commits October 25, 2024 20:08

Merge branch 'main' into replace_defaultClient_usage

03bbe45

MirroringUpdateProcessor switch to Http2SolrClient

07e6bb4

Removed httpclient dependency from cross-dc

1ba30bd

github-actions bot added the tool:build label Oct 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SOLR-16503: Replace default USH apache client with Http2SolrClient #2741

SOLR-16503: Replace default USH apache client with Http2SolrClient #2741

iamsanjay commented Oct 4, 2024

iamsanjay commented Oct 5, 2024 •

edited

Loading

dsmiley Oct 6, 2024

dsmiley Oct 10, 2024

dsmiley Oct 10, 2024

dsmiley Oct 17, 2024

dsmiley Oct 17, 2024

		var response = solrClient.requestWithBaseUrl(baseUrl, client -> client.request(request));
		var response = solrClient.requestWithBaseUrl(baseUrl, request::process).getResponse();

SOLR-16503: Replace default USH apache client with Http2SolrClient #2741

Are you sure you want to change the base?

SOLR-16503: Replace default USH apache client with Http2SolrClient #2741

Conversation

iamsanjay commented Oct 4, 2024

Checklist

iamsanjay commented Oct 5, 2024 • edited Loading

dsmiley Oct 6, 2024

Choose a reason for hiding this comment

dsmiley Oct 10, 2024

Choose a reason for hiding this comment

dsmiley Oct 10, 2024

Choose a reason for hiding this comment

dsmiley Oct 17, 2024

Choose a reason for hiding this comment

dsmiley Oct 17, 2024

Choose a reason for hiding this comment

iamsanjay commented Oct 5, 2024 •

edited

Loading