Skip to content

Avoid pausing circuit simultaneously with disposing of it #63010

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
merged 9 commits into from
Aug 5, 2025
Merged

Avoid pausing circuit simultaneously with disposing of it #63010

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
012ba12
Tests -these with pausing will fail.
ilonatommy Jul 30, 2025
d67b511
Fix.
ilonatommy Jul 30, 2025
f8b1eb5
Use single threaded dispatcher to make sure pausing does not happen c…
ilonatommy Jul 31, 2025
1ee0e9f
One more scenario that used to fail: double pause.
ilonatommy Jul 31, 2025
10a5fc3
nit: formatting + 2nd rerun of CI
ilonatommy Jul 31, 2025
7de4107
Merge branch 'main' into fix-62672
ilonatommy Jul 31, 2025
89047be
Merge branch 'main' into fix-62672
ilonatommy Aug 1, 2025
731c74e
Merge branch 'main' into fix-62672
ilonatommy Aug 1, 2025
2565707
Scope down changes to the smallest fix.
ilonatommy Aug 5, 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
39 changes: 21 additions & 18 deletions src/Components/Server/src/Circuits/CircuitPersistenceManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,29 @@ internal partial class CircuitPersistenceManager(
{
public async Task PauseCircuitAsync(CircuitHost circuit, bool saveStateToClient = false, CancellationToken cancellation = default)
{
var renderer = circuit.Renderer;
var persistenceManager = circuit.Services.GetRequiredService<ComponentStatePersistenceManager>();
var collector = new CircuitPersistenceManagerCollector(circuitOptions, serverComponentSerializer, circuit.Renderer);
using var subscription = persistenceManager.State.RegisterOnPersisting(
collector.PersistRootComponents,
RenderMode.InteractiveServer);
await circuit.Renderer.Dispatcher.InvokeAsync(async () =>
{
var renderer = circuit.Renderer;
var persistenceManager = circuit.Services.GetRequiredService<ComponentStatePersistenceManager>();
var collector = new CircuitPersistenceManagerCollector(circuitOptions, serverComponentSerializer, circuit.Renderer);
using var subscription = persistenceManager.State.RegisterOnPersisting(
collector.PersistRootComponents,
RenderMode.InteractiveServer);

await persistenceManager.PersistStateAsync(collector, renderer);
await persistenceManager.PersistStateAsync(collector, renderer);

if (saveStateToClient)
{
await SaveStateToClient(circuit, collector.PersistedCircuitState, cancellation);
}
else
{
await circuitPersistenceProvider.PersistCircuitAsync(
circuit.CircuitId,
collector.PersistedCircuitState,
cancellation);
}
if (saveStateToClient)
{
await SaveStateToClient(circuit, collector.PersistedCircuitState, cancellation);
}
else
{
await circuitPersistenceProvider.PersistCircuitAsync(
circuit.CircuitId,
collector.PersistedCircuitState,
cancellation);
}
});
}

internal async Task SaveStateToClient(CircuitHost circuit, PersistedCircuitState state, CancellationToken cancellation = default)
Expand Down
Loading