Refinement of the Polly policy for the deadlocked transactions retry …

…logic.
Ed-Fi-Alliance-OSS · Nov 7, 2024 · de1be1b · de1be1b
1 parent 3c42a50
commit de1be1b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/Application/EdFi.Ods.Common/Infrastructure/Repositories/CreateEntity.cs b/Application/EdFi.Ods.Common/Infrastructure/Repositories/CreateEntity.cs
@@ -107,23 +107,29 @@ public async Task CreateAsync(TEntity entity, bool enforceOptimisticLock, Cancel
                 }
 
                 // Save the incoming entity
-                var retryContext = new Dictionary<string, object>(_retryPolicyContextData);
-
                 await DeadlockPolicyHelper.RetryPolicy.ExecuteAsync(
                     async ctx =>
                     {
+                        bool isRetry = false;
+
+                        if (ctx.TryGetValue("Retries", out object retryCount))
+                        {
+                            isRetry = true;
+                            _logger.Info($"Retry #{retryCount}: Retrying create of '{typeof(TEntity).Name}'...");
+                        }
+
                         using (ITransaction trans = Session.BeginTransaction())
                         {
                             await Session.SaveAsync(entity, cancellationToken);
                             await trans.CommitAsync(cancellationToken);
                         }
 
-                        if (retryContext.TryGetValue("Retries", out object retryCount))
+                        if (isRetry)
                         {
-                            _logger.Info($"Creation of '{typeof(TEntity).Name}' succeeded after {retryCount} retries...");
+                            _logger.Info($"Retry #{retryCount}: Successfully created '{typeof(TEntity).Name}' after {retryCount} retries...");
                         }
                     },
-                    retryContext);
+                    _retryPolicyContextData);
 
                 bool IdHasValue()
                 {

diff --git a/Application/EdFi.Ods.Common/Infrastructure/Repositories/UpdateEntity.cs b/Application/EdFi.Ods.Common/Infrastructure/Repositories/UpdateEntity.cs
@@ -40,20 +40,26 @@ public async Task UpdateAsync(TEntity persistentEntity, CancellationToken cancel
                 }
 
                 // Save the incoming entity
-                var retryContext = new Dictionary<string, object>(_retryPolicyContextData);
-
                 await DeadlockPolicyHelper.RetryPolicy.ExecuteAsync(
                     async ctx =>
                     {
+                        bool isRetry = false;
+
+                        if (ctx.TryGetValue("Retries", out object retryCount))
+                        {
+                            isRetry = true;
+                            _logger.Info($"Retry #{retryCount}: Retrying update of '{typeof(TEntity).Name}'...");
+                        }
+
                         using (ITransaction trans = Session.BeginTransaction())
                         {
                             await Session.UpdateAsync(persistentEntity, cancellationToken);
                             await trans.CommitAsync(cancellationToken);
                         }
 
-                        if (retryContext.TryGetValue("Retries", out object retryCount))
+                        if (isRetry)
                         {
-                            _logger.Info($"Update of '{typeof(TEntity).Name}' succeeded after {retryCount} retries...");
+                            _logger.Info($"Retry #{retryCount}: Successfully updated '{typeof(TEntity).Name}' after {retryCount} retries...");
                         }
                     },
                     _retryPolicyContextData);