Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1073,11 +1073,16 @@ async Task<string> IsExecutableInstanceAsync(
TaskMessage executionTerminatedEventMessage = newMessages.LastOrDefault(msg => msg.Event is ExecutionTerminatedEvent);
if (executionTerminatedEventMessage is not null)
{
var executionTerminatedEvent = (ExecutionTerminatedEvent)executionTerminatedEventMessage.Event;
await this.trackingStore.UpdateStatusForTerminationAsync(
instanceId,
executionTerminatedEvent);
return $"Instance is {OrchestrationStatus.Terminated}";
InstanceStatus instanceStatus = await this.trackingStore.FetchInstanceStatusAsync(executionTerminatedEventMessage.OrchestrationInstance.InstanceId);
if (instanceStatus != null
&& instanceStatus.State.OrchestrationInstance.ExecutionId == executionTerminatedEventMessage.OrchestrationInstance.ExecutionId)
{
var executionTerminatedEvent = (ExecutionTerminatedEvent)executionTerminatedEventMessage.Event;
await this.trackingStore.UpdateStatusForTerminationAsync(
instanceId,
executionTerminatedEvent);
return $"Instance is {OrchestrationStatus.Terminated}";
}
}

// A non-zero event count usually happens when an instance's history is overwritten by a
Expand Down
Loading