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

SOLR-17637: Fix LBHttpSolrClient & HttpShardHandler bug #3147

Merged
merged 3 commits into from
Jan 30, 2025
Merged

SOLR-17637: Fix LBHttpSolrClient & HttpShardHandler bug #3147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
310ac97
SOLR-17637: Fix LBHttpSolrClient & HttpShardHandler bug
HoustonPutman Jan 29, 2025
efde6cd
Merge remote-tracking branch 'apache/main' into lb-http2-bug
HoustonPutman Jan 30, 2025
a5a845f
Add changelog entry
HoustonPutman Jan 30, 2025
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
3 changes: 3 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ Bug Fixes
current live nodes list is stale. CloudSolrClient now retains the initial configured list of passed URLs as backup
used for fetching cluster state when all live nodes have failed. (Matthew Biscocho via David Smiley, Houston Putman)

* SOLR-17637: LBHttp2SolrClient can fail to complete async requests in certain error scenarios.
This can cause the HttpShardHandler to indefinitely wait on a completed response that will never come. (Houston Putman)

Dependency Upgrades
---------------------
* SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, Christine Poerschke)
Expand Down
2 changes: 1 addition & 1 deletion solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void onFailure(Exception e, boolean retryReq) {
Endpoint url;
try {
url = it.nextOrError(e);
} catch (SolrServerException ex) {
} catch (Throwable ex) {
apiFuture.completeExceptionally(e);
return;
}
Expand Down
4 changes: 3 additions & 1 deletion solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,9 @@ public synchronized Endpoint nextOrError(Exception previousEx) throws SolrServer
}
// Skipping check time exceeded for the first request
// Ugly string based hack but no live servers message here is VERY misleading :(
if ((previousEx != null && previousEx.getMessage().contains("Limits exceeded!"))
if ((previousEx != null
&& previousEx.getMessage() != null
&& previousEx.getMessage().contains("Limits exceeded!"))
|| (numServersTried > 0 && isTimeExceeded(timeAllowedNano, timeOutTime))) {
throw new SolrServerException(
"The processing limits for to this request were exceeded, see cause for details",
Expand Down
Loading