Skip to content

Refactor HttpAPIClientHelper to improve response cleanup handling #2615

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

Merged
chernser merged 3 commits into from
Oct 21, 2025
Merged

Refactor HttpAPIClientHelper to improve response cleanup handling #2615

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
d5455db
Refactor HttpAPIClientHelper to improve response cleanup handling
aleksei-griaznov Oct 17, 2025
617dcbb
Refactor HttpAPIClientHelper to improve response cleanup handling. Br…
aleksei-griaznov Oct 21, 2025
593ab6d
Refactor HttpAPIClientHelper to improve response cleanup handling. Lo…
aleksei-griaznov Oct 21, 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: 2 additions & 1 deletion client-v2/src/main/java/com/clickhouse/client/api/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,6 +1605,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
if (httpResponse.getCode() == HttpStatus.SC_SERVICE_UNAVAILABLE) {
LOG.warn("Failed to get response. Server returned {}. Retrying. (Duration: {})", System.nanoTime() - startTime, httpResponse.getCode());
selectedEndpoint = getNextAliveNode();
HttpAPIClientHelper.closeQuietly(httpResponse);
continue;
}

Expand All @@ -1625,7 +1626,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
return new QueryResponse(httpResponse, responseFormat, requestSettings, metrics);

} catch (Exception e) {
httpClientHelper.closeQuietly(httpResponse);
HttpAPIClientHelper.closeQuietly(httpResponse);
lastException = httpClientHelper.wrapException(String.format("Query request failed (Attempt: %s/%s - Duration: %s)",
(i + 1), (retries + 1), System.nanoTime() - startTime), e);
if (httpClientHelper.shouldRetry(e, requestSettings.getAllSettings())) {
Expand Down
6 changes: 5 additions & 1 deletion client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,14 @@ public ClassicHttpResponse executeRequest(Endpoint server, Map<String, Object> r
closeQuietly(httpResponse);
LOG.warn("Failed to connect to '{}': {}", server.getBaseURL(), e.getMessage());
throw e;
} catch (Exception e) {
closeQuietly(httpResponse);
LOG.debug("Failed to execute request to '{}': {}", server.getBaseURL(), e.getMessage(), e);
throw e;
}
}

public void closeQuietly(ClassicHttpResponse httpResponse) {
public static void closeQuietly(ClassicHttpResponse httpResponse) {
if (httpResponse != null) {
try {
httpResponse.close();
Expand Down
Loading