Merge pull request #60 from tencentyun/feature_nedzzhang_54a490c9

learningZhang · web-flow · commit 8f26b4f3328f · 2025-06-09T20:10:56.000+08:00
更新 C# SDK 的重试机制，支持自定义域名切换和重试配置优化
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.46.0</Version>
+    <Version>5.4.47.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.46.0";
+        private static string SDKVersion = "5.4.47.0";
         // 主版本号：第一个数字，产品改动较大，可能无法向后兼容（要看具体项目）
         // 子版本号：第二个数字，增加了新功能，向后兼容 
         // 修正版本号：第三个数字，修复BUG 或优化代码，一般没有添加新功能，向后兼容
diff --git a/QCloudCSharpSDK/COSXML/CosXmlConfig.cs b/QCloudCSharpSDK/COSXML/CosXmlConfig.cs
@@ -28,6 +28,8 @@ public sealed class CosXmlConfig
         /// </summary>
         /// <value></value>
         public string host { get; private set; }
+        
+        public string retryHost;
 
         private CosXmlConfig(Builder builder)
         {
@@ -38,6 +40,7 @@ private CosXmlConfig(Builder builder)
             this.isDebug = builder.isDebug;
             this.endpointSuffix = builder.endpointSuffix;
             this.host = builder.host;
+            this.retryHost = builder.retryHost;
         }
 
         /// <summary>
@@ -119,6 +122,8 @@ public sealed class Builder
 
             internal string host;
 
+            internal string retryHost;
+            
             /// <summary>
             /// 初始化一个构造器
             /// </summary>
@@ -138,6 +143,12 @@ public Builder SetAppid(string appid)
 
                 return this;
             }
+            
+            public Builder SetRetryHost(string host)
+            {
+                this.retryHost = host;
+                return this;
+            }
 
             /// <summary>
             /// 存储桶所属地域
diff --git a/QCloudCSharpSDK/COSXML/Model/CosRequest.cs b/QCloudCSharpSDK/COSXML/Model/CosRequest.cs
@@ -82,6 +82,9 @@ public bool? IsHttps
             set { isHttps = value; }
         }
 
+        
+        public int MaxRetry = 3;
+        
         /// <summary>
         /// http method
         /// </summary>
diff --git a/QCloudCSharpSDK/COSXML/Model/Object/ObjectRequest.cs b/QCloudCSharpSDK/COSXML/Model/Object/ObjectRequest.cs
@@ -94,7 +94,12 @@ public override Network.RequestBody GetRequestBody()
         public override string GetHost()
         {
             StringBuilder hostBuilder = new StringBuilder();
-
+            if (!String.IsNullOrEmpty(serviceConfig.retryHost) && !RetryKeepDefaultDomain && RetryUseBackupDomain)
+            {
+                hostBuilder.Append(serviceConfig.retryHost);
+                return hostBuilder.ToString();
+            }
+            
             if (!String.IsNullOrEmpty(serviceConfig.host))
             {
                 hostBuilder.Append(serviceConfig.host);
@@ -125,7 +130,7 @@ public override string GetHost()
             String hostStr = hostBuilder.ToString();
             
             //用户保持原域名 和 条件判断重试使用备用域名
-            if (RetryKeepDefaultDomain && RetryUseBackupDomain)
+            if (!RetryKeepDefaultDomain && RetryUseBackupDomain)
             {
                 StringBuilder pattern = new StringBuilder();
                 pattern.Append(".cos.").Append(region).Append(".myqcloud.com");
diff --git a/QCloudCSharpSDK/COSXML/Network/CommandTask.cs b/QCloudCSharpSDK/COSXML/Network/CommandTask.cs
@@ -138,6 +138,10 @@ private static void HandleHttpWebRequest(HttpWebRequest httpWebRequest, Request
                 // httpWebRequest.ContentLength = request.Body.ContentLength;
                 request.Body.OnWrite(httpWebRequest.GetRequestStream());
             }
+            else
+            {
+                httpWebRequest.ContentLength = 0L;
+            }
             //print request start log
             PrintReqeustInfo(httpWebRequest);
         }
diff --git a/QCloudCSharpSDK/COSXML/Network/HttpClient.cs b/QCloudCSharpSDK/COSXML/Network/HttpClient.cs
@@ -34,8 +34,7 @@ public sealed class HttpClient
         private static Object syncInstance = new Object();
 
         private const int MAX_ACTIVIE_TASKS = 5;
-
-        public int MaxRetry { private get; set;} = 3;
+        
 
         private volatile int activieTasks = 0;
 
@@ -146,7 +145,7 @@ public void InternalExcute(CosRequest cosRequest, CosResult cosResult, QCloudCre
             catch (CosServerException serverException)
             {
                 // 状态码为301/302/307时，满足域名切换条件（域名匹配myqcloud.com & 响应不含cos requestid & 开启域名切换开关）时，进行3次重试；其余不重试
-                if (retryIndex < MaxRetry && 
+                if (retryIndex < cosRequest.MaxRetry && 
                     (serverException.statusCode == 301 || serverException.statusCode == 302 || serverException.statusCode == 307))
                 {
                     if (request.Host.Contains("myqcloud.com") && serverException.requestId == String.Empty)
@@ -156,9 +155,9 @@ public void InternalExcute(CosRequest cosRequest, CosResult cosResult, QCloudCre
                     cosRequest.SetRequestHeader("x-cos-sdk-retry", "true");
                     InternalExcute(cosRequest, cosResult, credentialProvider, retryIndex + 1);
                 }
-                else if (retryIndex < MaxRetry && serverException.statusCode >= 500)
+                else if (retryIndex < cosRequest.MaxRetry && serverException.statusCode >= 500)
                 {
-                    if (retryIndex == MaxRetry - 1)
+                    if (retryIndex == cosRequest.MaxRetry - 1 || !cosRequest.RetryKeepDefaultDomain)//最后一次切换域名
                     {
                         cosRequest.RetryUseBackupDomain = true;
                     }
diff --git a/QCloudCSharpSDK/COSXMLTests/ObjectTest.cs b/QCloudCSharpSDK/COSXMLTests/ObjectTest.cs
@@ -1973,6 +1973,7 @@ public async Task TestDownloadTask()
         {
             GetObjectRequest request = new GetObjectRequest(bucket, commonKey, localDir, localFileName);
             request.LimitTraffic(8 * 1024 * 1024);
+            request.MaxRetry = 2;
 
             //执行请求
             COSXMLDownloadTask downloadTask = new COSXMLDownloadTask(request);
diff --git a/QCloudCSharpSDK/COSXMLTests/Utils/RequestTest.cs b/QCloudCSharpSDK/COSXMLTests/Utils/RequestTest.cs
@@ -42,9 +42,6 @@ public void InitTest()
             }
 
             req.RequestUrlString = "test-url";
-            HttpClient httpClient = HttpClient.GetInstance();
-            var maxRetry = httpClient.MaxRetry = 5;
-            Assert.AreEqual(5, maxRetry);
             // CosXmlConfig.Builder cosXmlConfig = new CosXmlConfig();
             try
             {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace COSXML.Common`
`9`	`9`	`{`
`10`	`10`	`public sealed class CosVersion`
`11`	`11`	`{`
`12`		`- private static string SDKVersion = "5.4.46.0";`
	`12`	`+ private static string SDKVersion = "5.4.47.0";`
`13`	`13`	`// 主版本号：第一个数字，产品改动较大，可能无法向后兼容（要看具体项目）`
`14`	`14`	`// 子版本号：第二个数字，增加了新功能，向后兼容`
`15`	`15`	`// 修正版本号：第三个数字，修复BUG 或优化代码，一般没有添加新功能，向后兼容`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ public bool? IsHttps`
`82`	`82`	`set { isHttps = value; }`
`83`	`83`	`}`
`84`	`84`
	`85`	`+`
	`86`	`+ public int MaxRetry = 3;`
	`87`	`+`
`85`	`88`	`/// <summary>`
`86`	`89`	`/// http method`
`87`	`90`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,10 @@ private static void HandleHttpWebRequest(HttpWebRequest httpWebRequest, Request`
`138`	`138`	`// httpWebRequest.ContentLength = request.Body.ContentLength;`
`139`	`139`	`request.Body.OnWrite(httpWebRequest.GetRequestStream());`
`140`	`140`	`}`
	`141`	`+ else`
	`142`	`+ {`
	`143`	`+ httpWebRequest.ContentLength = 0L;`
	`144`	`+ }`
`141`	`145`	`//print request start log`
`142`	`146`	`PrintReqeustInfo(httpWebRequest);`
`143`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ public sealed class HttpClient`
`34`	`34`	`private static Object syncInstance = new Object();`
`35`	`35`
`36`	`36`	`private const int MAX_ACTIVIE_TASKS = 5;`
`37`		`-`
`38`		`- public int MaxRetry { private get; set;} = 3;`
	`37`	`+`
`39`	`38`
`40`	`39`	`private volatile int activieTasks = 0;`
`41`	`40`
`@@ -146,7 +145,7 @@ public void InternalExcute(CosRequest cosRequest, CosResult cosResult, QCloudCre`
`146`	`145`	`catch (CosServerException serverException)`
`147`	`146`	`{`
`148`	`147`	`// 状态码为301/302/307时，满足域名切换条件（域名匹配myqcloud.com & 响应不含cos requestid & 开启域名切换开关）时，进行3次重试；其余不重试`
`149`		`- if (retryIndex < MaxRetry &&`
	`148`	`+ if (retryIndex < cosRequest.MaxRetry &&`
`150`	`149`	`(serverException.statusCode == 301 \|\| serverException.statusCode == 302 \|\| serverException.statusCode == 307))`
`151`	`150`	`{`
`152`	`151`	`if (request.Host.Contains("myqcloud.com") && serverException.requestId == String.Empty)`
`@@ -156,9 +155,9 @@ public void InternalExcute(CosRequest cosRequest, CosResult cosResult, QCloudCre`
`156`	`155`	`cosRequest.SetRequestHeader("x-cos-sdk-retry", "true");`
`157`	`156`	`InternalExcute(cosRequest, cosResult, credentialProvider, retryIndex + 1);`
`158`	`157`	`}`
`159`		`- else if (retryIndex < MaxRetry && serverException.statusCode >= 500)`
	`158`	`+ else if (retryIndex < cosRequest.MaxRetry && serverException.statusCode >= 500)`
`160`	`159`	`{`
`161`		`- if (retryIndex == MaxRetry - 1)`
	`160`	`+ if (retryIndex == cosRequest.MaxRetry - 1 \|\| !cosRequest.RetryKeepDefaultDomain)//最后一次切换域名`
`162`	`161`	`{`
`163`	`162`	`cosRequest.RetryUseBackupDomain = true;`
`164`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1973,6 +1973,7 @@ public async Task TestDownloadTask()`
`1973`	`1973`	`{`
`1974`	`1974`	`GetObjectRequest request = new GetObjectRequest(bucket, commonKey, localDir, localFileName);`
`1975`	`1975`	`request.LimitTraffic(8 * 1024 * 1024);`
	`1976`	`+ request.MaxRetry = 2;`
`1976`	`1977`
`1977`	`1978`	`//执行请求`
`1978`	`1979`	`COSXMLDownloadTask downloadTask = new COSXMLDownloadTask(request);`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,6 @@ public void InitTest()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`req.RequestUrlString = "test-url";`
`45`		`- HttpClient httpClient = HttpClient.GetInstance();`
`46`		`- var maxRetry = httpClient.MaxRetry = 5;`
`47`		`- Assert.AreEqual(5, maxRetry);`
`48`	`45`	`// CosXmlConfig.Builder cosXmlConfig = new CosXmlConfig();`
`49`	`46`	`try`
`50`	`47`	`{`