Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace CloudLegacySolrClient with CloudHttp2SolrClient in SolrClientCloudManager #2751

Merged
merged 12 commits into from
Oct 24, 2024
Merged

Replace CloudLegacySolrClient with CloudHttp2SolrClient in SolrClientCloudManager #2751

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
57e11d5
Replaced CloudLegacySolrClient with CloudHttp2SolrClient for SolrClie…
iamsanjay Oct 8, 2024
a2dc271
removed unusedDeclaredArtifacts httpclient, httpcore from solrj-zooke…
iamsanjay Oct 8, 2024
fd0fcbe
Switching to CloudSolrClient ref
iamsanjay Oct 11, 2024
7701aa6
Merge branch 'main' into jetty_solrClientCloudManager
iamsanjay Oct 11, 2024
cee40b9
Merge branch 'main' into jetty_solrClientCloudManager
iamsanjay Oct 17, 2024
140d5e0
Switch to CloudHttp2SolrClient to easily access Http2SolrClient
iamsanjay Oct 17, 2024
2763f69
Merge branch 'main' into jetty_solrClientCloudManager
iamsanjay Oct 21, 2024
8fc6129
Provided http2SolrClient with custom timeouts
iamsanjay Oct 21, 2024
40fbab7
Merge main
iamsanjay Oct 24, 2024
2d33669
Addresses gh comments
iamsanjay Oct 24, 2024
284b9ee
changes.txt
iamsanjay Oct 24, 2024
1040917
changes.txt
iamsanjay Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions solr/core/src/java/org/apache/solr/cloud/ZkController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.cloud.SolrCloudManager;
import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;
import org.apache.solr.client.solrj.impl.SolrClientCloudManager;
import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;
Expand Down Expand Up @@ -199,6 +200,9 @@ public String toString() {
public final ZkStateReader zkStateReader;
private SolrCloudManager cloudManager;

// only for internal usage-only
iamsanjay marked this conversation as resolved.
Show resolved Hide resolved
private Http2SolrClient http2SolrClient;

private CloudHttp2SolrClient cloudSolrClient;

private final String zkServerAddress; // example: 127.0.0.1:54062/solr
Expand Down Expand Up @@ -769,6 +773,7 @@ public void close() {

sysPropsCacher.close();
customThreadPool.execute(() -> IOUtils.closeQuietly(cloudSolrClient));
iamsanjay marked this conversation as resolved.
Show resolved Hide resolved
customThreadPool.execute(() -> IOUtils.closeQuietly(http2SolrClient));
customThreadPool.execute(() -> IOUtils.closeQuietly(cloudManager));
dsmiley marked this conversation as resolved.
Show resolved Hide resolved

try {
Expand Down Expand Up @@ -865,10 +870,15 @@ public SolrCloudManager getSolrCloudManager() {
if (cloudManager != null) {
return cloudManager;
}
cloudSolrClient =
new CloudHttp2SolrClient.Builder(
Collections.singletonList(getZkServerAddress()), Optional.empty())
http2SolrClient =
new Http2SolrClient.Builder()
.withHttpClient(cc.getDefaultHttpSolrClient())
.withIdleTimeout(30000, TimeUnit.MILLISECONDS)
.withConnectionTimeout(15000, TimeUnit.MILLISECONDS)
.build();
cloudSolrClient =
new CloudHttp2SolrClient.Builder(List.of(getZkServerAddress()), Optional.empty())
.withHttpClient(http2SolrClient)
.build();
cloudManager = new SolrClientCloudManager(cc.getObjectCache(), cloudSolrClient);
cloudManager.getClusterStateProvider().connect();
Expand Down
Loading