Add race condition fix in critical section logic (#1248)

andystaples · web-flow · commit 00f70b7c8d4a · 2025-10-09T11:07:51.000-06:00
- Fix making a specific entity locking race condition error correctly
diff --git a/src/DurableTask.Core/Entities/OrchestrationEntityContext.cs b/src/DurableTask.Core/Entities/OrchestrationEntityContext.cs
@@ -187,7 +187,7 @@ public bool ValidateAcquireTransition(out string? errorMessage)
         /// <param name="targetInstanceId"></param>
         public void RecoverLockAfterCall(string targetInstanceId)
         {
-            if (this.IsInsideCriticalSection)
+            if (this.IsInsideCriticalSection && !this.lockAcquisitionPending)
             {
                 var lockToUse = EntityId.FromString(targetInstanceId);
                 this.availableLocks!.Add(lockToUse);

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public bool ValidateAcquireTransition(out string? errorMessage)`
`187`	`187`	`/// <param name="targetInstanceId"></param>`
`188`	`188`	`public void RecoverLockAfterCall(string targetInstanceId)`
`189`	`189`	`{`
`190`		`- if (this.IsInsideCriticalSection)`
	`190`	`+ if (this.IsInsideCriticalSection && !this.lockAcquisitionPending)`
`191`	`191`	`{`
`192`	`192`	`var lockToUse = EntityId.FromString(targetInstanceId);`
`193`	`193`	`this.availableLocks!.Add(lockToUse);`