Merge pull request #1596 from ClickHouse/fix-handling-no-response

wrappend req execution. added test

Author: chernser

clickhouse-http-client/pom.xml

@@ -103,6 +103,14 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Replace with newer version as soon java 11 is minimal version -->
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <version>2.35.2</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ApacheHttpConnectionImpl.java

@@ -3,6 +3,7 @@
 import com.clickhouse.client.AbstractSocketClient;
 import com.clickhouse.client.ClickHouseClient;
 import com.clickhouse.client.ClickHouseConfig;
+import com.clickhouse.client.ClickHouseException;
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseRequest;
 import com.clickhouse.client.ClickHouseSocketFactory;
@@ -249,7 +250,12 @@ protected ClickHouseHttpResponse post(ClickHouseConfig config, String sql, Click
         ClickHouseHttpEntity postBody = new ClickHouseHttpEntity(config, contentType, contentEncoding, boundary,
                 sql, data, tables);
         post.setEntity(postBody);
-        CloseableHttpResponse response = client.execute(post);
+        CloseableHttpResponse response;
+        try {
+            response = client.execute(post);
+        } catch (IOException e) {
+            throw new ConnectException(ClickHouseUtils.format("HTTP request failed: %s", e.getMessage()));
+        }
 
         checkResponse(config, response);
         // buildResponse should use the config of current request in case of reusable

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ApacheHttpConnectionImplTest.java

@@ -2,6 +2,7 @@
 
 import com.clickhouse.client.ClickHouseClient;
 import com.clickhouse.client.ClickHouseConfig;
+import com.clickhouse.client.ClickHouseException;
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.ClickHouseRequest;
@@ -22,6 +23,9 @@
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.http.Fault;
 import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -115,4 +119,29 @@ public void testCustomOptions() throws Exception {
             CustomSocketFactory.created.set(false);
         }
     }
+
+    private WireMockServer faultyServer;
+
+    @Test(groups = {"unit"})
+    public void testFailureWhileRequest() {
+        faultyServer = new WireMockServer(9090);
+        faultyServer.start();
+        try {
+            faultyServer.addStubMapping(WireMock.post(WireMock.anyUrl())
+                    .willReturn(WireMock.aResponse().withFault(Fault.EMPTY_RESPONSE)).build());
+
+            ClickHouseHttpClient httpClient = new ClickHouseHttpClient();
+            ClickHouseConfig config = new ClickHouseConfig();
+            httpClient.init(config);
+            ClickHouseRequest request = httpClient.read("http://localhost:9090/").query("SELECT 1");
+
+            try {
+                httpClient.executeAndWait(request);
+            } catch (ClickHouseException e) {
+                Assert.assertEquals(e.getErrorCode(), ClickHouseException.ERROR_NETWORK);
+            }
+        } finally {
+            faultyServer.stop();
+        }
+    }
 }