Skip to content

Fix history events buildup from version reject #1220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cgillum merged 2 commits into from
May 23, 2025
Merged

Fix history events buildup from version reject #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e587e35
Fix history events buildup from version reject
halspang May 22, 2025
dced275
Return true to signify interrupted work
halspang May 23, 2025
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
16 changes: 9 additions & 7 deletions src/DurableTask.Core/TaskOrchestrationDispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ protected async Task<bool> OnProcessWorkItemAsync(TaskOrchestrationWorkItem work
else // Abandon work item in all other cases (will be retried later).
{
await this.orchestrationService.AbandonTaskOrchestrationWorkItemAsync(workItem);
break;
return true;
}
}
}
Expand Down Expand Up @@ -1059,9 +1059,10 @@ TaskMessage ProcessScheduleTaskDecision(
eventId: scheduleTaskOrchestratorAction.Id,
name: scheduleTaskOrchestratorAction.Name,
version: scheduleTaskOrchestratorAction.Version,
input: scheduleTaskOrchestratorAction.Input) {
Tags = scheduleTaskOrchestratorAction.Tags
};
input: scheduleTaskOrchestratorAction.Input)
{
Tags = scheduleTaskOrchestratorAction.Tags
};

ActivitySpanId clientSpanId = ActivitySpanId.CreateRandom();

Expand All @@ -1080,9 +1081,10 @@ TaskMessage ProcessScheduleTaskDecision(
scheduledEvent = new TaskScheduledEvent(
eventId: scheduleTaskOrchestratorAction.Id,
name: scheduleTaskOrchestratorAction.Name,
version: scheduleTaskOrchestratorAction.Version) {
Tags = scheduleTaskOrchestratorAction.Tags
};
version: scheduleTaskOrchestratorAction.Version)
{
Tags = scheduleTaskOrchestratorAction.Tags
};

if (parentTraceActivity != null)
{
Expand Down
3 changes: 3 additions & 0 deletions test/DurableTask.AzureStorage.Tests/AzureStorageScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,6 +2518,9 @@ public async Task OrchestrationRejectsWithVersionMismatch()
status = await client.GetStatusAsync();
Assert.IsTrue(OrchestrationStatus.Running == status?.OrchestrationStatus || OrchestrationStatus.Pending == status?.OrchestrationStatus);

var history = await client.GetOrchestrationHistoryAsync(client.InstanceId);
Assert.AreEqual(0, history.Count, "A rejected orchestration should have no history as it should never have been started.");

await host.StopAsync();
}
}
Expand Down
Loading