elsa-core/test/integration/Elsa.Workflows.IntegrationTests/GracefulShutdown/InterruptedRecoveryIntegrationTests.cs
Sipke Schoorstra 5ab383ce86
fix: stop requeuing Finished+Interrupted workflow instances (#8052)
* fix: stop requeuing Finished+Interrupted workflow instances

InterruptedRecoveryScanner now requires Status=Running, matching the
sibling crash-recovery task. DrainOrchestrator skips already-terminal
instances so a runner-clobber race cannot stamp Interrupted onto a
Finished row. Fixes #8052.

Co-authored-by: Sipke Schoorstra <sipkeschoorstra@outlook.com>

* fix: conditionally mark Interrupted so drain cannot clobber Finished

PersistInterruptedAsync no longer SaveAsync-es the Find snapshot. The
store now applies Interrupted only when Status is still non-terminal
(EF: ExecuteUpdate WHERE Status != Finished; memory: mutate the live
row). A runner that commits Finished between read and write keeps its
terminal state, so startup recovery cannot requeue completed work.

Co-authored-by: Sipke Schoorstra <sipkeschoorstra@outlook.com>

* test: disambiguate NSubstitute Returns for TryMarkInterruptedAsync

Co-authored-by: Sipke Schoorstra <sipkeschoorstra@outlook.com>

* fix: make in-memory Interrupted mark atomic against completion

Lock the memory-store check and mutations together, then abort if Status
became Finished in-place so drain cannot record Interrupted on a
completed instance.

Co-authored-by: Sipke Schoorstra <sipkeschoorstra@outlook.com>

* fix: share memory-store lock between Interrupted mark and Save

TryMarkInterruptedAsync now serializes with Save/Update/SaveMany so a
runner's terminal persist cannot land between the non-terminal check
and the Interrupted mutations. A finishing Save therefore cannot leave
Finished+Interrupted.

Co-authored-by: Sipke Schoorstra <sipkeschoorstra@outlook.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
2026-09-11 23:05:43 -07:00

163 lines
7.9 KiB
C#

using Elsa.Common.Models;
using Elsa.Extensions;
using Elsa.Testing.Shared;
using Elsa.Workflows.Management;
using Elsa.Workflows.Management.Entities;
using Elsa.Workflows.Management.Filters;
using Elsa.Workflows.Runtime;
using Microsoft.Extensions.DependencyInjection;
using Xunit.Abstractions;
namespace Elsa.Workflows.IntegrationTests.GracefulShutdown;
/// <summary>
/// Integration tests for the activation-time recovery of <see cref="WorkflowSubStatus.Interrupted"/> instances
/// (Phase 5 / US3). The scanner runs against the real <see cref="IWorkflowInstanceStore"/> — backed by the in-memory
/// store in this test setup — and exercises the same code path as production.
/// </summary>
public class InterruptedRecoveryIntegrationTests
{
private readonly IServiceProvider _services;
public InterruptedRecoveryIntegrationTests(ITestOutputHelper testOutputHelper)
{
_services = new TestApplicationBuilder(testOutputHelper)
.ConfigureElsa(elsa => elsa.UseWorkflowRuntime())
.Build();
}
[Theory(DisplayName = "ScanAndRequeueAsync requeues 100% of Interrupted instances (SC-003)")]
[InlineData(1)]
[InlineData(10)]
[InlineData(100)]
public async Task RequeuesAllInterruptedInstances(int count)
{
var fakeRestarter = new RecordingRestarter();
using var scope = _services.CreateScope();
var instanceStore = scope.ServiceProvider.GetRequiredService<IWorkflowInstanceStore>();
await SeedInstancesAsync(instanceStore, count, WorkflowSubStatus.Interrupted, isExecuting: false);
var scanner = ActivatorUtilities.CreateInstance<Elsa.Workflows.Runtime.Services.InterruptedRecoveryScanner>(scope.ServiceProvider, fakeRestarter);
var requeued = await scanner.ScanAndRequeueAsync(CancellationToken.None);
Assert.Equal(count, requeued);
Assert.Equal(count, fakeRestarter.RestartedIds.Count);
}
[Fact(DisplayName = "Scan ignores instances NOT in Interrupted sub-status (T071 — filter purity)")]
public async Task FilterPurity()
{
var fakeRestarter = new RecordingRestarter();
using var scope = _services.CreateScope();
var instanceStore = scope.ServiceProvider.GetRequiredService<IWorkflowInstanceStore>();
await SeedInstancesAsync(instanceStore, 3, WorkflowSubStatus.Interrupted, isExecuting: false, idPrefix: "interrupted-");
await SeedInstancesAsync(instanceStore, 2, WorkflowSubStatus.Suspended, isExecuting: false, idPrefix: "suspended-");
await SeedInstancesAsync(instanceStore, 2, WorkflowSubStatus.Cancelled, isExecuting: false, idPrefix: "cancelled-");
await SeedInstancesAsync(instanceStore, 1, WorkflowSubStatus.Faulted, isExecuting: false, idPrefix: "faulted-");
// Stale-executing instance — handled by the existing RestartInterruptedWorkflowsTask, not by the new scan.
await SeedInstancesAsync(instanceStore, 1, WorkflowSubStatus.Executing, isExecuting: true, idPrefix: "stale-");
var scanner = ActivatorUtilities.CreateInstance<Elsa.Workflows.Runtime.Services.InterruptedRecoveryScanner>(scope.ServiceProvider, fakeRestarter);
var requeued = await scanner.ScanAndRequeueAsync(CancellationToken.None);
Assert.Equal(3, requeued);
Assert.All(fakeRestarter.RestartedIds, id => Assert.StartsWith("interrupted-", id));
}
[Fact(DisplayName = "Scan does NOT touch IsExecuting=true instances (T069 — disjoint from RestartInterruptedWorkflowsTask)")]
public async Task DisjointFromTimeoutBasedRecovery()
{
var fakeRestarter = new RecordingRestarter();
using var scope = _services.CreateScope();
var instanceStore = scope.ServiceProvider.GetRequiredService<IWorkflowInstanceStore>();
// The two recovery paths use disjoint filters:
// - RestartInterruptedWorkflowsTask (recurring): IsExecuting=true AND UpdatedAt < threshold AND Status=Running
// - RecoverInterruptedWorkflowsStartupTask (this scan): SubStatus = Interrupted AND Status = Running (IsExecuting=false)
await SeedInstancesAsync(instanceStore, 2, WorkflowSubStatus.Interrupted, isExecuting: false, idPrefix: "graceful-");
await SeedInstancesAsync(instanceStore, 2, WorkflowSubStatus.Executing, isExecuting: true, idPrefix: "ungraceful-");
var scanner = ActivatorUtilities.CreateInstance<Elsa.Workflows.Runtime.Services.InterruptedRecoveryScanner>(scope.ServiceProvider, fakeRestarter);
var requeued = await scanner.ScanAndRequeueAsync(CancellationToken.None);
Assert.Equal(2, requeued);
Assert.All(fakeRestarter.RestartedIds, id => Assert.StartsWith("graceful-", id));
// The 'ungraceful-' instances remain in the store, untouched, available for the timeout-based task.
var stillExecuting = await instanceStore.FindManyAsync(new WorkflowInstanceFilter { IsExecuting = true }, CancellationToken.None);
Assert.Equal(2, stillExecuting.Count());
}
[Fact(DisplayName = "Scan does NOT requeue Finished+Interrupted instances (issue #8052)")]
public async Task DoesNotRequeueFinishedInterruptedInstances()
{
var fakeRestarter = new RecordingRestarter();
using var scope = _services.CreateScope();
var instanceStore = scope.ServiceProvider.GetRequiredService<IWorkflowInstanceStore>();
await SeedInstancesAsync(instanceStore, 2, WorkflowSubStatus.Interrupted, isExecuting: false, idPrefix: "running-", status: WorkflowStatus.Running);
await SeedInstancesAsync(instanceStore, 3, WorkflowSubStatus.Interrupted, isExecuting: false, idPrefix: "finished-", status: WorkflowStatus.Finished);
var scanner = ActivatorUtilities.CreateInstance<Elsa.Workflows.Runtime.Services.InterruptedRecoveryScanner>(scope.ServiceProvider, fakeRestarter);
var requeued = await scanner.ScanAndRequeueAsync(CancellationToken.None);
Assert.Equal(2, requeued);
Assert.All(fakeRestarter.RestartedIds, id => Assert.StartsWith("running-", id));
var stillFinishedInterrupted = await instanceStore.FindManyAsync(
new WorkflowInstanceFilter
{
WorkflowSubStatus = WorkflowSubStatus.Interrupted,
WorkflowStatus = WorkflowStatus.Finished,
},
CancellationToken.None);
Assert.Equal(3, stillFinishedInterrupted.Count());
}
private static async Task SeedInstancesAsync(
IWorkflowInstanceStore store,
int count,
WorkflowSubStatus subStatus,
bool isExecuting,
string idPrefix = "instance-",
WorkflowStatus status = WorkflowStatus.Running)
{
for (var i = 0; i < count; i++)
{
await store.SaveAsync(new WorkflowInstance
{
Id = $"{idPrefix}{i}",
DefinitionId = "def-1",
DefinitionVersionId = "ver-1",
Version = 1,
Status = status,
SubStatus = subStatus,
IsExecuting = isExecuting,
CreatedAt = DateTimeOffset.UtcNow,
UpdatedAt = DateTimeOffset.UtcNow,
WorkflowState = new Workflows.State.WorkflowState
{
Id = $"{idPrefix}{i}",
DefinitionId = "def-1",
DefinitionVersionId = "ver-1",
Status = status,
SubStatus = subStatus,
},
}, CancellationToken.None);
}
}
/// <summary>Captures restart calls without actually invoking the workflow runtime — keeps the integration test focused.</summary>
private sealed class RecordingRestarter : IWorkflowRestarter
{
public List<string> RestartedIds { get; } = new();
public Task RestartWorkflowAsync(string workflowInstanceId, CancellationToken cancellationToken = default)
{
RestartedIds.Add(workflowInstanceId);
return Task.CompletedTask;
}
}
}