Merge pull request #65 from shibayan/feature/retry

Improvement retry strategy
shibayan · Mar 25, 2019 · 2e29e86 · 2e29e86
2 parents 0aff5fa + 4e51eb6
commit 2e29e86
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/AzureAppService.LetsEncrypt/AddCertificate.cs b/AzureAppService.LetsEncrypt/AddCertificate.cs
@@ -7,6 +7,8 @@
 
 using ACMESharp.Protocol;
 
+using AzureAppService.LetsEncrypt.Internal;
+
 using Microsoft.Azure.Management.WebSites.Models;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Extensions.Http;
@@ -70,7 +72,7 @@ public static async Task RunOrchestrator([OrchestrationTrigger] DurableOrchestra
                     var result = await context.CallActivityAsync<ChallengeResult>(nameof(SharedFunctions.Dns01Authorization), authorization);
 
                     // Azure DNS で正しくレコードが引けるか確認
-                    await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckDnsChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6), result);
+                    await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckDnsChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6) { Handle = HandleRetriableException }, result);
 
                     challenges.Add(result);
                 }
@@ -80,7 +82,7 @@ public static async Task RunOrchestrator([OrchestrationTrigger] DurableOrchestra
                     var result = await context.CallActivityAsync<ChallengeResult>(nameof(SharedFunctions.Http01Authorization), (site, authorization));
 
                     // HTTP で正しくアクセスできるか確認
-                    await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckHttpChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6), result);
+                    await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckHttpChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6) { Handle = HandleRetriableException }, result);
 
                     challenges.Add(result);
                 }
@@ -90,7 +92,7 @@ public static async Task RunOrchestrator([OrchestrationTrigger] DurableOrchestra
             await context.CallActivityAsync(nameof(SharedFunctions.AnswerChallenges), challenges);
 
             // Order のステータスが ready になるまで 60 秒待機
-            await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckIsReady), new RetryOptions(TimeSpan.FromSeconds(5), 12), orderDetails);
+            await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckIsReady), new RetryOptions(TimeSpan.FromSeconds(5), 12) { Handle = HandleRetriableException }, orderDetails);
 
             // Order の最終処理を実行し PFX を作成
             var (thumbprint, pfxBlob) = await context.CallActivityAsync<(string, byte[])>(nameof(SharedFunctions.FinalizeOrder), (request.Domains, orderDetails));
@@ -142,6 +144,11 @@ public static async Task<HttpResponseMessage> HttpStart(
 
             return await starter.WaitForCompletionOrCreateCheckStatusResponseAsync(req, instanceId, TimeSpan.FromMinutes(5));
         }
+
+        private static bool HandleRetriableException(Exception exception)
+        {
+            return exception.InnerException is RetriableActivityException;
+        }
     }
 
     public class AddCertificateRequest

diff --git a/AzureAppService.LetsEncrypt/AzureAppService.LetsEncrypt.csproj b/AzureAppService.LetsEncrypt/AzureAppService.LetsEncrypt.csproj
@@ -10,8 +10,8 @@
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.WebSites" Version="2.0.1" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.7.1" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.25" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.8.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.26" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

diff --git a/AzureAppService.LetsEncrypt/RenewCertificates.cs b/AzureAppService.LetsEncrypt/RenewCertificates.cs
@@ -5,6 +5,8 @@
 
 using ACMESharp.Protocol;
 
+using AzureAppService.LetsEncrypt.Internal;
+
 using Microsoft.Azure.Management.WebSites.Models;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Extensions.Logging;
@@ -96,7 +98,7 @@ public static async Task RenewSiteCertificates([OrchestrationTrigger] DurableOrc
                         var result = await context.CallActivityAsync<ChallengeResult>(nameof(SharedFunctions.Dns01Authorization), authorization);
 
                         // Azure DNS で正しくレコードが引けるか確認
-                        await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckDnsChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6), result);
+                        await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckDnsChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6) { Handle = HandleRetriableException }, result);
 
                         challenges.Add(result);
                     }
@@ -105,7 +107,7 @@ public static async Task RenewSiteCertificates([OrchestrationTrigger] DurableOrc
                         var result = await context.CallActivityAsync<ChallengeResult>(nameof(SharedFunctions.Http01Authorization), (site, authorization));
 
                         // HTTP で正しくアクセスできるか確認
-                        await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckHttpChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6), result);
+                        await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckHttpChallenge), new RetryOptions(TimeSpan.FromSeconds(10), 6) { Handle = HandleRetriableException }, result);
 
                         challenges.Add(result);
                     }
@@ -115,7 +117,7 @@ public static async Task RenewSiteCertificates([OrchestrationTrigger] DurableOrc
                 await context.CallActivityAsync(nameof(SharedFunctions.AnswerChallenges), challenges);
 
                 // Order のステータスが ready になるまで 60 秒待機
-                await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckIsReady), new RetryOptions(TimeSpan.FromSeconds(5), 12), orderDetails);
+                await context.CallActivityWithRetryAsync(nameof(SharedFunctions.CheckIsReady), new RetryOptions(TimeSpan.FromSeconds(5), 12) { Handle = HandleRetriableException }, orderDetails);
 
                 // Order の最終処理を実行し PFX を作成
                 var (thumbprint, pfxBlob) = await context.CallActivityAsync<(string, byte[])>(nameof(SharedFunctions.FinalizeOrder), (certificate.HostNames, orderDetails));
@@ -140,5 +142,10 @@ public static async Task TimerStart([TimerTrigger("0 0 0 * * *")] TimerInfo time
 
             log.LogInformation($"Started orchestration with ID = '{instanceId}'.");
         }
+
+        private static bool HandleRetriableException(Exception exception)
+        {
+            return exception.InnerException is RetriableActivityException;
+        }
     }
 }