Add retry support for HTTP execution failure

Signed-off-by: Bala.FA <bala@minio.io>

Author: balamurugana

api/src/main/java/io/minio/BaseS3Client.java

@@ -21,7 +21,6 @@
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.google.common.collect.ImmutableSet;
 import io.minio.credentials.Credentials;
 import io.minio.credentials.Provider;
 import io.minio.errors.ErrorResponseException;
@@ -100,17 +99,13 @@ public abstract class BaseS3Client implements AutoCloseable {
           .build();
 
   private static final String RETRY_HEAD = "RetryHead";
-  private static final String END_HTTP = "----------END-HTTP----------";
-  private static final String UPLOAD_ID = "uploadId";
-  private static final Set<String> TRACE_QUERY_PARAMS =
-      ImmutableSet.of("retention", "legal-hold", "tagging", UPLOAD_ID, "acl", "attributes");
-  private PrintWriter traceStream;
+  private volatile PrintWriter traceStream;
   protected final Map<String, String> regionCache = new ConcurrentHashMap<>();
   protected String userAgent = Utils.getDefaultUserAgent();
 
   protected Http.BaseUrl baseUrl;
   protected Provider provider;
-  protected OkHttpClient httpClient;
+  protected volatile OkHttpClient httpClient;
   protected boolean closeHttpClient;
 
   protected BaseS3Client(
@@ -272,21 +267,17 @@ private String[] handleRedirectResponse(
   protected CompletableFuture<Response> executeAsync(Http.S3Request s3request, String region) {
     Credentials credentials = (provider == null) ? null : provider.fetch();
     Http.Request request = null;
+    PrintWriter traceStream = this.traceStream;
     try {
-      request = s3request.toRequest(baseUrl, region, credentials);
+      request = s3request.toRequest(baseUrl, region, credentials, traceStream);
     } catch (MinioException e) {
       return Utils.failedFuture(e);
     }
 
     StringBuilder traceBuilder = new StringBuilder(request.httpTraces());
-    PrintWriter traceStream = this.traceStream;
     if (traceStream != null) traceStream.print(request.httpTraces());
 
     OkHttpClient httpClient = this.httpClient;
-    // FIXME: enable retry for all request.
-    // if (!s3request.retryFailure()) {
-    //   httpClient = httpClient.newBuilder().retryOnConnectionFailure(false).build();
-    // }
 
     okhttp3.Request httpRequest = request.httpRequest();
     CompletableFuture<Response> completableFuture = newCompleteableFuture();
@@ -330,14 +321,14 @@ private void onResponse(final Response response) throws IOException {
                     Set<String> keys = s3request.queryParams().keySet();
                     if ((s3request.method() != Http.Method.GET
                             || s3request.object() == null
-                            || !Collections.disjoint(keys, TRACE_QUERY_PARAMS))
+                            || !Collections.disjoint(keys, Http.TRACE_QUERY_PARAMS))
                         && !(keys.contains("events")
                             && (keys.contains("prefix") || keys.contains("suffix")))) {
                       String responseBody = response.peekBody(1024 * 1024).string();
                       traceStream.print(responseBody);
                       if (!responseBody.endsWith("\n")) traceStream.println();
                     }
-                    traceStream.println(END_HTTP);
+                    traceStream.println(Http.END_HTTP);
                   }
 
                   completableFuture.complete(response);
@@ -357,8 +348,8 @@ private void onResponse(final Response response) throws IOException {
                     if (traceStream != null) traceStream.println();
                   }
                 }
-                traceBuilder.append(END_HTTP).append("\n");
-                if (traceStream != null) traceStream.println(END_HTTP);
+                traceBuilder.append(Http.END_HTTP).append("\n");
+                if (traceStream != null) traceStream.println(Http.END_HTTP);
 
                 // Error out for Non-XML response from server for non-HEAD requests.
                 String contentType = response.headers().get(Http.Headers.CONTENT_TYPE);
@@ -635,7 +626,7 @@ protected void checkArgs(BaseArgs args) {
   public CompletableFuture<AbortMultipartUploadResponse> abortMultipartUpload(
       AbortMultipartUploadArgs args) {
     checkArgs(args);
-    return executeDeleteAsync(args, null, new Http.QueryParameters(UPLOAD_ID, args.uploadId()))
+    return executeDeleteAsync(args, null, new Http.QueryParameters(Http.UPLOAD_ID, args.uploadId()))
         .thenApply(
             response -> {
               try {
@@ -672,7 +663,7 @@ public CompletableFuture<ObjectWriteResponse> completeMultipartUpload(
     return executePostAsync(
             args,
             args.ssec() == null ? null : args.ssec().headers(),
-            new Http.QueryParameters(UPLOAD_ID, args.uploadId()),
+            new Http.QueryParameters(Http.UPLOAD_ID, args.uploadId()),
             body)
         .thenApply(
             response -> {
@@ -1191,7 +1182,7 @@ public CompletableFuture<ListObjectVersionsResponse> listObjectVersions(
   public CompletableFuture<ListPartsResponse> listParts(ListPartsArgs args) {
     Http.QueryParameters queryParams =
         new Http.QueryParameters(
-            UPLOAD_ID,
+            Http.UPLOAD_ID,
             args.uploadId(),
             "max-parts",
             (args.maxParts() != null) ? args.maxParts().toString() : "1000");