Merge pull request #241 from tencentyun/dev/error_code_retry

rename fault tolerant

Author: Dzkol

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.6.246]
+- rename fault tolerant
+
 ## [5.6.244.4]
 - 3xx exception retry
 

pom.xml

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

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

@@ -814,11 +814,72 @@ public void rename(RenameRequest renameRequest)
                 "region is null, region in clientConfig must be specified when rename");
         rejectEmpty(renameRequest.getSrcObject(), "The length of the src key must be greater than 0");
         rejectEmpty(renameRequest.getDstObject(), "The length of the dst key must be greater than 0");
+
+        String srcInodeId = "";
+        if (clientConfig.isRenameFaultTolerant()) {
+            srcInodeId = getObjectInodeId(renameRequest.getBucketName(), renameRequest.getSrcObject(), renameRequest.getFixedEndpointAddr(),
+                    renameRequest.getCustomRequestHeaders());
+        }
+
         CosHttpRequest<RenameRequest> request = createRequest(renameRequest.getBucketName(),
                 renameRequest.getDstObject(), renameRequest, HttpMethodName.PUT);
         request.addParameter("rename", null);
         request.addHeader("x-cos-rename-source", UrlEncoderUtils.encodeEscapeDelimiter(renameRequest.getSrcObject()));
-        invoke(request, voidCosResponseHandler);
+        try {
+            invoke(request, voidCosResponseHandler);
+        } catch (CosServiceException cse) {
+            if (clientConfig.isRenameFaultTolerant() && cse.getStatusCode() == 404 && !srcInodeId.isEmpty()) {
+                if (!checkResultForRenameObject(srcInodeId, renameRequest)) {
+                    throw cse;
+                }
+            } else {
+                throw cse;
+            }
+        }
+    }
+
+    private boolean checkResultForRenameObject(String srcInodeId, RenameRequest renameRequest) {
+        /**
+         * try to head src object and dst object, and check their inode ids when catch exception
+         * rename request is successful only if src object does not exist and the inode ids of the source object and the target object are the same
+         * */
+        try {
+            getObjectInodeId(renameRequest.getBucketName(), renameRequest.getSrcObject(), renameRequest.getFixedEndpointAddr(), renameRequest.getCustomRequestHeaders());
+        } catch (CosServiceException cse) {
+            if (cse.getStatusCode() != 404) {
+                log.info("catch CosServiceException and status code is not 404 when getting the inode id of the source object, exp: ", cse);
+                return false;
+            }
+        } catch (CosClientException cce) {
+            log.info("catch CosClientException when getting the inode id of the source object, exp: ", cce);
+            return false;
+        }
+
+        String dstInodeId;
+        try {
+            dstInodeId = getObjectInodeId(renameRequest.getBucketName(), renameRequest.getDstObject(), renameRequest.getFixedEndpointAddr(), renameRequest.getCustomRequestHeaders());
+        } catch (Exception e) {
+            log.info("catch exception when getting the inode id of the target object, exp: ", e);
+            return false;
+        }
+        return Objects.equals(dstInodeId, srcInodeId);
+    }
+
+    private String getObjectInodeId(String bucketName, String key, String fixedEndpointAddr, Map<String, String> customHeaders)
+            throws CosServiceException, CosClientException {
+        GetObjectMetadataRequest getObjectMetadataRequest = new GetObjectMetadataRequest(bucketName, key);
+        if (fixedEndpointAddr != null && !fixedEndpointAddr.isEmpty()) {
+            getObjectMetadataRequest.setFixedEndpointAddr(fixedEndpointAddr);
+        }
+
+        if (customHeaders != null) {
+            for (Map.Entry<String, String> e : customHeaders.entrySet()) {
+                getObjectMetadataRequest.putCustomRequestHeader(e.getKey(), e.getValue());
+            }
+        }
+
+        ObjectMetadata objectMetadata = getObjectMetadata(getObjectMetadataRequest);
+        return objectMetadata.getInodeId() == null ? "" : objectMetadata.getInodeId();
     }
 
     protected <UploadObjectRequest extends PutObjectRequest>

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

@@ -145,6 +145,8 @@ public class ClientConfig {
 
     private boolean throw304Directly = false;
 
+    private boolean renameFaultTolerant = false;
+
     // 不传入region 用于后续调用List Buckets(获取所有的bucket信息)
     public ClientConfig() {
         super();
@@ -537,4 +539,12 @@ public boolean isThrow304Directly() {
     public void setThrow304Directly(boolean throw304Directly) {
         this.throw304Directly = throw304Directly;
     }
+
+    public boolean isRenameFaultTolerant() {
+        return renameFaultTolerant;
+    }
+
+    public void setRenameFaultTolerant(boolean renameFaultTolerant) {
+        this.renameFaultTolerant = renameFaultTolerant;
+    }
 }

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

@@ -334,4 +334,6 @@ public interface Headers {
     public static final String ENCRYPTION_PART_SIZE = "client-side-encryption-part-size";
 
     public static final String SYMLINK_TARGET = "x-cos-symlink-target";
+
+    public static final String INODE_ID = "x-cos-inode-id";
 }

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

@@ -842,4 +842,8 @@ public boolean isNeedPreflight() {
         }
         return false;
     }
+
+    public String getInodeId() {
+        return (String) metadata.get(Headers.INODE_ID);
+    }
 }