added check for the option to enable retry

Author: chernser

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

@@ -251,14 +251,14 @@ protected ClickHouseHttpResponse post(ClickHouseConfig config, String sql, Click
         post.setEntity(postBody);
         CloseableHttpResponse response = null;
 
-        for (int attempt = 0; attempt < 2; attempt++) {
-            log.debug("HTTP request attempt {}", attempt);
+        int retryAttempts = config.getBoolOption(ClickHouseHttpOption.AHC_RETRY_ON_FAILURE) ? 2 : 1;
+        for (int attempt = 0; attempt < retryAttempts; attempt++) {
+            log.debug("HTTP request attempt " + attempt);
             try {
                 response = client.execute(post);
                 break;
             } catch (NoHttpResponseException e) {
-                log.warn("HTTP request failed: ", e.getMessage());
-                if (attempt > 0) {
+                if ((retryAttempts - attempt - 1) == 0) {
                     throw new ConnectException(e.getMessage());
                 } else {
                     continue;

clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java

@@ -80,12 +80,7 @@ public enum ClickHouseHttpOption implements ClickHouseOption {
      *     <li>{@code 503 Service Unavailable}</li>
      * </ul>
      */
-    AHC_RETRY_ON_FAILURE("ahc_retry_on_failure", true, "Whether to retry on failure with AsyncHttpClient."),
-
-    /**
-     * Retry interval in milliseconds for AsyncHttpClient (if {@link #AHC_RETRY_ON_FAILURE} is enabled).
-     */
-    AHC_RETRY_INTERVAL("ahc_retry_interval", 100, "Retry interval in milliseconds."),
+    AHC_RETRY_ON_FAILURE("ahc_retry_on_failure", true, "Whether to retry on failure with AsyncHttpClient.")
     ;
 
     private final String key;

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

@@ -133,15 +133,20 @@ public void testFailureWhileRequest() {
                     .willReturn(WireMock.aResponse().withFault(Fault.EMPTY_RESPONSE)).build());
 
             ClickHouseHttpClient httpClient = new ClickHouseHttpClient();
-            ClickHouseConfig config = new ClickHouseConfig();
+            Map<ClickHouseOption, Serializable> options = new HashMap<>();
+            options.put(ClickHouseHttpOption.AHC_RETRY_ON_FAILURE, false);
+            ClickHouseConfig config = new ClickHouseConfig(options);
             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);
+                return;
             }
+
+            Assert.fail("Should throw exception");
         } finally {
             faultyServer.stop();
         }
@@ -153,12 +158,14 @@ public void testRetryOnFailure() {
         faultyServer.start();
         try {
             faultyServer.addStubMapping(WireMock.post(WireMock.anyUrl())
+                            .withRequestBody(WireMock.equalTo("SELECT 1"))
                             .inScenario("Retry")
                             .whenScenarioStateIs(Scenario.STARTED)
                             .willReturn(WireMock.aResponse().withFault(Fault.EMPTY_RESPONSE))
                             .willSetStateTo("Failed")
                     .build());
             faultyServer.addStubMapping(WireMock.post(WireMock.anyUrl())
+                            .withRequestBody(WireMock.equalTo("SELECT 1"))
                             .inScenario("Retry")
                             .whenScenarioStateIs("Failed")
                             .willReturn(WireMock.aResponse()