From 48fdb94a44c206c27624a1cf961f0aea12466749 Mon Sep 17 00:00:00 2001 From: Sophia Tevosyan Date: Wed, 3 Dec 2025 20:46:03 -0800 Subject: [PATCH 1/2] first commit --- .../AzureStorageOrchestrationService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs b/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs index 482cb7683..7f3f30f7f 100644 --- a/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs +++ b/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs @@ -1100,7 +1100,7 @@ await this.trackingStore.UpdateStatusForTerminationAsync( runtimeState.OrchestrationStatus != OrchestrationStatus.Suspended) { InstanceStatus instanceStatus = await this.trackingStore.FetchInstanceStatusAsync(runtimeState.OrchestrationInstance.InstanceId); - if (instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId + if (instanceStatus == null || instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId && instanceStatus.State.OrchestrationStatus != runtimeState.OrchestrationStatus) { await this.trackingStore.UpdateInstanceStatusAndDeleteOrphanedBlobsForCompletedOrchestrationAsync( From 434bcfc1f9fad5897dc9cecc9f8f3def9b5c34aa Mon Sep 17 00:00:00 2001 From: sophiatev <38052607+sophiatev@users.noreply.github.com> Date: Wed, 3 Dec 2025 20:53:03 -0800 Subject: [PATCH 2/2] Fix condition for instance status check --- .../AzureStorageOrchestrationService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs b/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs index 7f3f30f7f..c6ca54d4c 100644 --- a/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs +++ b/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs @@ -1100,8 +1100,8 @@ await this.trackingStore.UpdateStatusForTerminationAsync( runtimeState.OrchestrationStatus != OrchestrationStatus.Suspended) { InstanceStatus instanceStatus = await this.trackingStore.FetchInstanceStatusAsync(runtimeState.OrchestrationInstance.InstanceId); - if (instanceStatus == null || instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId - && instanceStatus.State.OrchestrationStatus != runtimeState.OrchestrationStatus) + if (instanceStatus == null || (instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId + && instanceStatus.State.OrchestrationStatus != runtimeState.OrchestrationStatus)) { await this.trackingStore.UpdateInstanceStatusAndDeleteOrphanedBlobsForCompletedOrchestrationAsync( runtimeState.OrchestrationInstance.InstanceId,