exceptions

Author: chernser

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

@@ -46,6 +46,7 @@
 import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStream;
 import org.apache.hc.core5.concurrent.DefaultThreadFactory;
 import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ConnectionRequestTimeoutException;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.NoHttpResponseException;
 import org.slf4j.Logger;
@@ -892,7 +893,7 @@ public CompletableFuture<InsertResponse> insert(String tableName, List<?> data,
                         metrics.operationComplete();
                         metrics.setQueryId(queryId);
                         return new InsertResponse(metrics);
-                    } catch (NoHttpResponseException e) {
+                    } catch (NoHttpResponseException | ConnectionRequestTimeoutException e) {
                         LOG.warn("Failed to get response. Retrying.", e);
                         selectedNode = getNextAliveNode();
                         continue;
@@ -1010,12 +1011,12 @@ public CompletableFuture<InsertResponse> insert(String tableName,
                         metrics.operationComplete();
                         metrics.setQueryId(queryId);
                         return new InsertResponse(metrics);
-                    } catch (NoHttpResponseException e) {
+                    } catch (NoHttpResponseException | ConnectionRequestTimeoutException e) {
                         if (i < maxRetries) {
                             try {
                                 data.reset();
                             } catch (IOException ioe) {
-                                throw new ClientException("Failed to get response", e);
+                                throw new ClientException("Failed to reset stream for retry", e);
                             }
                             LOG.warn("Failed to get response. Retrying.", e);
                             selectedNode = getNextAliveNode();
@@ -1173,6 +1174,10 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                         metrics.operationComplete();
 
                         return new QueryResponse(httpResponse, finalSettings.getFormat(), finalSettings, metrics);
+                    } catch (NoHttpResponseException | ConnectionRequestTimeoutException e) {
+                        LOG.warn("Failed to get response. Retrying.", e);
+                        selectedNode = getNextAliveNode();
+                        continue;
                     } catch (ClientException e) {
                         throw e;
                     } catch (Exception e) {

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

@@ -25,6 +25,7 @@
 import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
 import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ConnectionRequestTimeoutException;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
@@ -246,11 +247,7 @@ public ClassicHttpResponse executeRequest(ClickHouseNode server, Map<String, Obj
         } catch (ConnectException | NoRouteToHostException e) {
             LOG.warn("Failed to connect to '{}': {}", server.getHost(), e.getMessage());
             throw new ClientException("Failed to connect", e);
-        } catch (ServerException e) {
-            throw e;
-        } catch (NoHttpResponseException e) {
-            throw e;
-        } catch (ClientException e) {
+        } catch (ServerException | NoHttpResponseException | ConnectionRequestTimeoutException | ClientException e) {
             throw e;
         } catch (Exception e) {
             throw new ClientException("Failed to execute request", e);