Fix Null Reference Bug in Instance and History Table Sync (#1271)

sophiatev · Sophia Tevosyan · web-flow · commit dfca343927e2 · 2025-12-03T21:49:55.000-08:00
* first commit

* Fix condition for instance status check

---------

Co-authored-by: Sophia Tevosyan &lt;stevosyan@microsoft.com&gt;
diff --git 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.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,

Original file line number	Diff line number	Diff line change
`@@ -1100,8 +1100,8 @@ await this.trackingStore.UpdateStatusForTerminationAsync(`
`1100`	`1100`	`runtimeState.OrchestrationStatus != OrchestrationStatus.Suspended)`
`1101`	`1101`	`{`
`1102`	`1102`	`InstanceStatus instanceStatus = await this.trackingStore.FetchInstanceStatusAsync(runtimeState.OrchestrationInstance.InstanceId);`
`1103`		`- if (instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId`
`1104`		`- && instanceStatus.State.OrchestrationStatus != runtimeState.OrchestrationStatus)`
	`1103`	`+ if (instanceStatus == null \|\| (instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId`
	`1104`	`+ && instanceStatus.State.OrchestrationStatus != runtimeState.OrchestrationStatus))`
`1105`	`1105`	`{`
`1106`	`1106`	`await this.trackingStore.UpdateInstanceStatusAndDeleteOrphanedBlobsForCompletedOrchestrationAsync(`
`1107`	`1107`	`runtimeState.OrchestrationInstance.InstanceId,`