Handle timeouts and broken streams in Trino client

Trino client does retries on timeouts that happen before it starts
decoding the response body, but it should also retry when they happen in
the middle. Because the exception will get wrapped in the JsonResponse,
check it before attempting to read the data.

client/trino-client/src/main/java/io/trino/client/StatementClientV1.java

@@ -29,7 +29,10 @@
 import okhttp3.RequestBody;
 
 import java.io.IOException;
+import java.io.InterruptedIOException;
 import java.io.UnsupportedEncodingException;
+import java.net.ProtocolException;
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -47,6 +50,7 @@
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Throwables.getCausalChain;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.net.HttpHeaders.ACCEPT_ENCODING;
 import static com.google.common.net.HttpHeaders.USER_AGENT;
@@ -400,6 +404,10 @@ public boolean advance()
                 cause = e;
                 continue;
             }
+            if (isTransient(response.getException())) {
+                cause = response.getException();
+                continue;
+            }
 
             if ((response.getStatusCode() == HTTP_OK) && response.hasValue()) {
                 processResponse(response.getHeaders(), response.getValue());
@@ -413,6 +421,14 @@ public boolean advance()
         }
     }
 
+    private boolean isTransient(Throwable exception)
+    {
+        return exception != null && getCausalChain(exception).stream()
+                .anyMatch(e -> (e instanceof InterruptedIOException && e.getMessage().equals("timeout")
+                        || e instanceof ProtocolException
+                        || e instanceof SocketTimeoutException));
+    }
+
     private void processResponse(Headers headers, QueryResults results)
     {
         setCatalog.set(headers.get(TRINO_HEADERS.responseSetCatalog()));

client/trino-client/src/test/java/io/trino/client/TestRetry.java

@@ -0,0 +1,131 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.client;
+
+import com.google.common.collect.ImmutableList;
+import io.airlift.json.JsonCodec;
+import io.airlift.units.Duration;
+import okhttp3.OkHttpClient;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.SocketPolicy;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.URI;
+import java.time.ZoneId;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
+import static com.google.common.net.MediaType.JSON_UTF_8;
+import static io.airlift.json.JsonCodec.jsonCodec;
+import static io.trino.client.StatementClientFactory.newStatementClient;
+import static io.trino.spi.type.StandardTypes.INTEGER;
+import static io.trino.spi.type.StandardTypes.VARCHAR;
+import static java.lang.String.format;
+import static java.net.HttpURLConnection.HTTP_OK;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertTrue;
+
+@Test(singleThreaded = true)
+public class TestRetry
+{
+    private MockWebServer server;
+    private static final JsonCodec<QueryResults> QUERY_RESULTS_CODEC = jsonCodec(QueryResults.class);
+
+    @BeforeMethod(alwaysRun = true)
+    public void setup()
+            throws Exception
+    {
+        server = new MockWebServer();
+        server.start();
+    }
+
+    @AfterMethod(alwaysRun = true)
+    public void teardown()
+            throws IOException
+    {
+        server.close();
+        server = null;
+    }
+
+    @Test
+    public void testRetryOnBrokenStream()
+    {
+        java.time.Duration timeout = java.time.Duration.ofMillis(100);
+        OkHttpClient httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeout)
+                .readTimeout(timeout)
+                .writeTimeout(timeout)
+                .callTimeout(timeout)
+                .build();
+        ClientSession session = ClientSession.builder()
+                .server(URI.create("http://" + server.getHostName() + ":" + server.getPort()))
+                .timeZone(ZoneId.of("UTC"))
+                .clientRequestTimeout(Duration.valueOf("2s"))
+                .build();
+
+        server.enqueue(statusAndBody(HTTP_OK, newQueryResults("RUNNING")));
+        server.enqueue(statusAndBody(HTTP_OK, newQueryResults("FINISHED"))
+                .setSocketPolicy(SocketPolicy.DISCONNECT_DURING_RESPONSE_BODY));
+        server.enqueue(statusAndBody(HTTP_OK, newQueryResults("FINISHED")));
+
+        try (StatementClient client = newStatementClient(httpClient, session, "SELECT 1", Optional.empty())) {
+            while (client.advance()) {
+                // consume all client data
+            }
+            assertTrue(client.isFinished());
+        }
+        assertThat(server.getRequestCount()).isEqualTo(3);
+    }
+
+    private String newQueryResults(String state)
+    {
+        String queryId = "20160128_214710_00012_rk68b";
+        int numRecords = 10;
+
+        QueryResults queryResults = new QueryResults(
+                queryId,
+                server.url("/query.html?" + queryId).uri(),
+                null,
+                state.equals("RUNNING") ? server.url(format("/v1/statement/%s/%s", queryId, "aa")).uri() : null,
+                Stream.of(new Column("id", INTEGER, new ClientTypeSignature("integer")),
+                                new Column("name", VARCHAR, new ClientTypeSignature("varchar")))
+                        .collect(toList()),
+                IntStream.range(0, numRecords)
+                        .mapToObj(index -> Stream.of((Object) index, "a").collect(toList()))
+                        .collect(toList()),
+                new StatementStats(state, state.equals("QUEUED"), true, OptionalDouble.of(0), OptionalDouble.of(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null),
+                null,
+                ImmutableList.of(),
+                null,
+                null);
+
+        return QUERY_RESULTS_CODEC.toJson(queryResults);
+    }
+
+    private static MockResponse statusAndBody(int status, String body)
+    {
+        return new MockResponse()
+                .setResponseCode(status)
+                .addHeader(CONTENT_TYPE, JSON_UTF_8)
+                .setBody(body);
+    }
+}