Skip to content

StateMachineManager: start work loop during activation #9725

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
ReubenBond merged 3 commits into from
Oct 23, 2025
Merged

StateMachineManager: start work loop during activation #9725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e1ed1e
StateMachineManager: start work loop during activation
ReubenBond Oct 22, 2025
d1c74d7
fix test
ReubenBond Oct 22, 2025
c4eef25
Merge branch 'main' into fix/smm-use-grain-lifecycle
ReubenBond Oct 22, 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
11 changes: 7 additions & 4 deletions src/Orleans.Journaling/StateMachineManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ internal sealed partial class StateMachineManager : IStateMachineManager, ILifec
private readonly Queue<WorkItem> _workQueue = new();
private readonly CancellationTokenSource _shutdownCancellation = new();
private readonly StateMachineManagerState _stateMachineIds;
private readonly Task _workLoop;
private Task? _workLoop;
private ManagerState _state;
private Task? _pendingWrite;
private ulong _nextStateMachineId = MinApplicationStateMachineId;
Expand All @@ -40,8 +40,6 @@ public StateMachineManager(
// This allows us to recover the list of state machines ids without having to store it separately.
_stateMachineIds = new StateMachineManagerState(this, StringCodec, UInt64Codec, serializerSessionPool);
_stateMachinesMap[0] = _stateMachineIds;

_workLoop = Start();
}

public void RegisterStateMachine(string name, IDurableStateMachine stateMachine)
Expand All @@ -65,6 +63,8 @@ public async ValueTask InitializeAsync(CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
_shutdownCancellation.Token.ThrowIfCancellationRequested();
Debug.Assert(_workLoop is null, "InitializeAsync should only be called once.");
_workLoop = Start();

Task task;
lock (_lock)
Expand Down Expand Up @@ -379,7 +379,10 @@ async Task ILifecycleObserver.OnStop(CancellationToken cancellationToken)
{
_shutdownCancellation.Cancel();
_workSignal.Signal();
await _workLoop.WaitAsync(cancellationToken).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext | ConfigureAwaitOptions.SuppressThrowing);
if (_workLoop is { } task)
{
await task.WaitAsync(cancellationToken).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext | ConfigureAwaitOptions.SuppressThrowing);
}
}

void IDisposable.Dispose()
Expand Down
2 changes: 1 addition & 1 deletion test/Orleans.Journaling.Tests/DurableQueueTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ public async Task DurableQueue_EmptyQueueOperations_Test()
var manager = sut.Manager;
var codec = CodecProvider.GetCodec<string>();
var queue = new DurableQueue<string>("emptyQueue", manager, codec, SessionPool);
await manager.WriteStateAsync(CancellationToken.None);
await sut.Lifecycle.OnStart();
await manager.WriteStateAsync(CancellationToken.None);

// Assert
Assert.Empty(queue);
Expand Down