Merge pull request #2615 from aleksei-griaznov/main

Refactor HttpAPIClientHelper to improve response cleanup handling

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -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;
                         }
 
@@ -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())) {

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -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();