not retry for preflight upload

Author: jeffreykzli

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.240.2</version>
+    <version>5.6.242</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>

src/main/java/com/qcloud/cos/COSClient.java

@@ -843,7 +843,8 @@ ObjectMetadata uploadObjectInternal(UploadMode uploadMode, UploadObjectRequest u
         try {
             preflightObj(uploadObjectRequest);
         } catch (CosServiceException cse) {
-            log.warn("fail to do the preflight request due to the service exception, will not do the upload obj request", cse);
+            String msg = String.format("fail to do the preflight request due to the service exception[statusCode:%s, requestId:%s], will not do the upload obj request", cse.getStatusCode(), cse.getRequestId());
+            log.warn(msg);
             throw cse;
         } catch (CosClientException cce) {
             log.warn("fail to do the preflight request due to the client exception, will not do the upload obj request", cce);
@@ -5544,6 +5545,7 @@ private void preflightObj(PutObjectRequest putObjectRequest) throws CosClientExc
         if (clientConfig.isCheckPreflightStatus() && preflightBuckets.containsKey(bucketName)) {
             String reqMsg = String.format("will do preflight request for put object[%s] to the bucket[%s]", key, bucketName);
             log.debug(reqMsg);
+            putObjectRequest.setHasDonePreflight(true);
             CosServiceRequest serviceRequest = new CosServiceRequest();
             Map<String, String> customHeaders = putObjectRequest.getCustomRequestHeaders();
             if (customHeaders != null) {

src/main/java/com/qcloud/cos/ClientConfig.java

@@ -135,6 +135,8 @@ public class ClientConfig {
 
     private boolean useConnectionMonitor = false;
 
+    private boolean retryAfterPreflight = false;
+
     private long connectionMaxIdleMillis = 60 * 1000;
 
     // 不传入region 用于后续调用List Buckets(获取所有的bucket信息)
@@ -497,4 +499,12 @@ public long getConnectionMaxIdleMillis() {
     public void setConnectionMaxIdleMillis(long connectionMaxIdleMillis) {
         this.connectionMaxIdleMillis = connectionMaxIdleMillis;
     }
+
+    public boolean isRetryAfterPreflight() {
+        return retryAfterPreflight;
+    }
+
+    public void setRetryAfterPreflight(boolean retryAfterPreflight) {
+        this.retryAfterPreflight = retryAfterPreflight;
+    }
 }

src/main/java/com/qcloud/cos/http/DefaultCosHttpClient.java

@@ -181,6 +181,7 @@ public InetAddress[] resolve(String host) throws UnknownHostException {
         }
         this.maxErrorRetry = clientConfig.getMaxErrorRetry();
         this.retryPolicy = ValidationUtils.assertNotNull(clientConfig.getRetryPolicy(), "retry policy");
+        this.retryPolicy.setRetryAfterPreflight(clientConfig.isRetryAfterPreflight());
         this.backoffStrategy = ValidationUtils.assertNotNull(clientConfig.getBackoffStrategy(), "backoff strategy");
         this.cosHttpClientTimer = new CosHttpClientTimer();
         initHttpClient();

src/main/java/com/qcloud/cos/model/PutObjectRequest.java

@@ -80,6 +80,8 @@
  */
 public class PutObjectRequest extends AbstractPutObjectRequest implements Serializable {
     private boolean enableResumableUpload = false;
+
+    private boolean hasDonePreflight = false;
     /**
      * Constructs a new
      * {@link PutObjectRequest} object to upload a file to the
@@ -236,4 +238,12 @@ public void setEnableResumableUpload(boolean useResumableUpload) {
     public boolean isEnableResumableUpload() {
         return enableResumableUpload;
     }
+
+    public boolean hasDonePreflight() {
+        return hasDonePreflight;
+    }
+
+    public void setHasDonePreflight(boolean hasDonePreflight) {
+        this.hasDonePreflight = hasDonePreflight;
+    }
 }

src/main/java/com/qcloud/cos/retry/PredefinedRetryPolicies.java

@@ -18,10 +18,13 @@
 package com.qcloud.cos.retry;
 
 import java.io.IOException;
+import java.util.Objects;
 
+import com.qcloud.cos.exception.CosServiceException;
 import com.qcloud.cos.http.CosHttpRequest;
 import com.qcloud.cos.internal.CosServiceRequest;
 
+import com.qcloud.cos.model.PutObjectRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.CircularRedirectException;
 import org.slf4j.Logger;
@@ -63,6 +66,14 @@ public <X extends CosServiceRequest> boolean shouldRetry(CosHttpRequest<X> reque
                 if (request.getParameters().containsKey("preflight")) {
                     return false;
                 }
+
+                if (!isRetryAfterPreflight() && request.getOriginalRequest() != null && request.getOriginalRequest() instanceof PutObjectRequest && ((PutObjectRequest) request.getOriginalRequest()).hasDonePreflight()) {
+                    if (((CosServiceException) exception).getStatusCode() == 503 && Objects.equals(((CosServiceException) exception).getErrorCode(), "SlowDown")) {
+                        log.info("will not retry for 503 while putting object, because preflight request has been done");
+                        return false;
+                    }
+                }
+
                 return true;
             }
 

src/main/java/com/qcloud/cos/retry/RetryPolicy.java

@@ -22,6 +22,15 @@
 import org.apache.http.HttpResponse;
 
 public abstract class RetryPolicy {
+    private boolean retryAfterPreflight = false;
+
+    public void setRetryAfterPreflight(boolean retryAfterPreflight) {
+        this.retryAfterPreflight = retryAfterPreflight;
+    }
+
+    public boolean isRetryAfterPreflight() {
+        return retryAfterPreflight;
+    }
 
     public abstract <X extends CosServiceRequest> boolean shouldRetry(CosHttpRequest<X> request,
             HttpResponse response,