高级接口支持自动断点续传, 全局支持配置重试

tencentyun · Jul 21, 2022 · 5108ca5 · 5108ca5
1 parent a6757d5
commit 5108ca5
Show file tree

Hide file tree

Showing 7 changed files with 283 additions and 13 deletions.
diff --git a/QCloudCSharpSDK/COSXML/COSXML-Netcore.csproj b/QCloudCSharpSDK/COSXML/COSXML-Netcore.csproj
@@ -11,7 +11,7 @@
     <Deterministic>true</Deterministic>
 
     <PackageId>Tencent.QCloud.Cos.Sdk</PackageId>
-    <Version>5.4.31.0</Version>
+    <Version>5.4.32.0</Version>
     <Authors>Tencent</Authors>
     <Company>Tencent</Company>
     <description>Tencent Cloud COS(Cloud Object Service) .Net SDK</description>

diff --git a/QCloudCSharpSDK/COSXML/Common/CosVersion.cs b/QCloudCSharpSDK/COSXML/Common/CosVersion.cs
@@ -9,7 +9,7 @@ namespace COSXML.Common
 {
     public sealed class CosVersion
     {
-        private static string SDKVersion = "5.4.31.0";
+        private static string SDKVersion = "5.4.32.0";
 
         public static string GetUserAgent()
         {

diff --git a/QCloudCSharpSDK/COSXML/Network/CommandTask.cs b/QCloudCSharpSDK/COSXML/Network/CommandTask.cs
@@ -25,6 +25,10 @@ public sealed class CommandTask
     {
         public const string TAG = "CommandTask";
 
+        public static int MaxRetries = 3;
+
+        public static HttpClientConfig config;
+
         /// <summary>
         /// init connectionLimit and statueCode = 100 action
         /// </summary>
@@ -33,6 +37,8 @@ public static void Init(HttpClientConfig config)
         {
             ServicePointManager.Expect100Continue = false;
             ServicePointManager.DefaultConnectionLimit = config.ConnectionLimit;
+            CommandTask.MaxRetries = config.MaxRetry;
+            CommandTask.config = config;
         }
 
         /// <summary>
@@ -160,7 +166,7 @@ private static void HandleHttpWebResponse(HttpWebResponse httpWebResponse, Respo
         /// <param name="request"></param>
         /// <param name="response"></param>
         /// <param name="config"></param>
-        public static void Schedue(Request request, Response response, HttpClientConfig config)
+        public static void Schedue(Request request, Response response, HttpClientConfig config, int retryIndex = 0)
         {
             HttpWebRequest httpWebRequest = null;
             RequestState requestState = new RequestState();
@@ -183,6 +189,7 @@ public static void Schedue(Request request, Response response, HttpClientConfig
 
                 requestState.httpWebRequest = httpWebRequest;
 
+                requestState.retryIndex = retryIndex;
                 //handle request body
                 if (request.Body != null)
                 {
@@ -238,6 +245,12 @@ public static void AsyncRequestCallback(IAsyncResult ar)
                     if (exception != null)
                     {
                         // handle request body throw exception
+                        if (requestState.retryIndex < MaxRetries)
+                        {
+                            QLog.Error(TAG, exception.Message, exception);
+                            Schedue(requestState.request, requestState.response, config, requestState.retryIndex + 1);
+                            return;
+                        }
                         requestState.response.OnFinish(false, exception);
                         //abort
                         requestState.Clear();
@@ -253,6 +266,12 @@ public static void AsyncRequestCallback(IAsyncResult ar)
             }
             catch (Exception ex)
             {
+                if (requestState.retryIndex < MaxRetries)
+                {
+                    QLog.Error(TAG, ex.Message, ex);
+                    Schedue(requestState.request, requestState.response, config, requestState.retryIndex + 1);
+                    return;
+                }
                 requestState.response.OnFinish(false, ex);
                 //abort
                 requestState.Clear();
@@ -291,7 +310,11 @@ public static void AsyncResponseCallback(IAsyncResult ar)
             }
             catch (WebException webEx)
             {
-
+                if (requestState.retryIndex < MaxRetries)
+                {
+                    Schedue(requestState.request, requestState.response, config, requestState.retryIndex + 1);
+                    return;
+                }
                 if (webEx.Response != null && webEx.Response is HttpWebResponse)
                 {
                     //nofity get response
@@ -326,6 +349,11 @@ public static void AsyncResponseCallback(IAsyncResult ar)
             }
             catch (Exception ex)
             {
+                if (requestState.retryIndex < MaxRetries)
+                {
+                    Schedue(requestState.request, requestState.response, config, requestState.retryIndex + 1);
+                    return;
+                }
                 requestState.response.OnFinish(false, ex);
                 //abort
                 requestState.Clear();
@@ -608,6 +636,8 @@ internal class RequestState
 
             public Request request;
 
+            public int retryIndex;
+
             public RequestState()
             {
                 httpWebRequest = null;

diff --git a/QCloudCSharpSDK/COSXML/Network/HttpClient.cs b/QCloudCSharpSDK/COSXML/Network/HttpClient.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 using System.Text;
@@ -35,6 +35,8 @@ public sealed class HttpClient
 
         private const int MAX_ACTIVIE_TASKS = 5;
 
+        public int MaxRetry { private get; set;} = 3;
+
         private volatile int activieTasks = 0;
 
         public static HttpClient GetInstance()
@@ -110,7 +112,7 @@ public void Schedue(CosRequest cosRequest, CosResult cosResult, COSXML.Callback.
         /// <param name="credentialProvider"></param>
         /// <exception cref="COSXML.CosException.CosClientException">CosClientException</exception>
         /// <exception cref="COSXML.CosException.CosServerException">CosServerException</exception>
-        public void InternalExcute(CosRequest cosRequest, CosResult cosResult, QCloudCredentialProvider credentialProvider)
+        public void InternalExcute(CosRequest cosRequest, CosResult cosResult, QCloudCredentialProvider credentialProvider, int retryIndex = 0)
         {
 
             try
@@ -141,17 +143,42 @@ public void InternalExcute(CosRequest cosRequest, CosResult cosResult, QCloudCre
                 cosRequest.BindRequest(request);
                 CommandTask.Excute(request, response, config);
             }
-            catch (CosServerException)
+            catch (CosServerException serverException)
             {
-                throw;
+                // 服务端5xx才重试
+                if (serverException.statusCode >= 500 && retryIndex < MaxRetry)
+                {
+                    InternalExcute(cosRequest, cosResult, credentialProvider, retryIndex + 1);
+                }
+                else
+                {
+                    throw;
+                }
             }
             catch (CosClientException)
             {
-                throw;
+                // 客户端异常都重试
+                if (retryIndex < MaxRetry)
+                {
+                    InternalExcute(cosRequest, cosResult, credentialProvider, retryIndex + 1);
+                }
+                else
+                {
+                    throw;
+                }
+
             }
             catch (Exception ex)
             {
-                throw new CosClientException((int)CosClientError.BadRequest, ex.Message, ex);
+                // 未知异常也重试
+                if (retryIndex < MaxRetry)
+                {
+                    InternalExcute(cosRequest, cosResult, credentialProvider, retryIndex + 1);
+                }
+                else
+                {
+                    throw new CosClientException((int)CosClientError.BadRequest, ex.Message, ex);
+                }
             }
 
         }

diff --git a/QCloudCSharpSDK/COSXML/Network/HttpClientConfig.cs b/QCloudCSharpSDK/COSXML/Network/HttpClientConfig.cs
@@ -159,6 +159,15 @@ public bool KeepAlive
             }
         }
 
+        public int MaxRetry
+        {
+            get
+            {
+
+                return maxRetry;
+            }
+        }
+
         public class Builder
         {
             internal string userAgent = CosVersion.GetUserAgent();
@@ -272,6 +281,13 @@ public Builder SetHttpKeepAlive(bool keepAlive)
                 return this;
             }
 
+            public Builder SetMaxRetry(int maxRetry)
+            {
+                this.maxRetry = maxRetry;
+
+                return this;
+            }
+
             public HttpClientConfig Build()
             {