Skip to content

[blazor] fix multiple calls to OnConnectionDownAsync #62518

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.

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
Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions src/Components/Server/src/Circuits/CircuitHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ internal partial class CircuitHost : IAsyncDisposable
private CircuitHandler[] _circuitHandlers;
private bool _initialized;
private bool _isFirstUpdate = true;
private bool _onConnectionDownFired;
private bool _disposed;
private long _startTime;
private PersistedCircuitState _persistedCircuitState;
Expand Down Expand Up @@ -279,6 +280,7 @@ private async Task OnCircuitOpenedAsync(CancellationToken cancellationToken)

public async Task OnConnectionUpAsync(CancellationToken cancellationToken)
{
_onConnectionDownFired = false;
Log.ConnectionUp(_logger, CircuitId, Client.ConnectionId);
_circuitMetrics?.OnConnectionUp();

Expand Down Expand Up @@ -309,6 +311,12 @@ public async Task OnConnectionUpAsync(CancellationToken cancellationToken)

public async Task OnConnectionDownAsync(CancellationToken cancellationToken)
{
if(_onConnectionDownFired)
{
return;
}

_onConnectionDownFired = true;
Log.ConnectionDown(_logger, CircuitId, Client.ConnectionId);
_circuitMetrics?.OnConnectionDown();

Expand Down
5 changes: 0 additions & 5 deletions src/Components/Server/src/Circuits/CircuitMetrics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ public void OnCircuitDown(long startTimestamp, long currentTimestamp)
_circuitActiveCounter.Add(-1);
}

if (_circuitConnectedCounter.Enabled)
{
_circuitConnectedCounter.Add(-1);
}

if (_circuitDuration.Enabled)
{
var duration = Stopwatch.GetElapsedTime(startTimestamp, currentTimestamp);
Expand Down
1 change: 1 addition & 0 deletions src/Components/Server/src/Circuits/CircuitRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ private async Task PauseAndDisposeCircuitHost(CircuitHost circuitHost, bool save
{
await _circuitPersistenceManager.PauseCircuitAsync(circuitHost, saveStateToClient);
circuitHost.UnhandledException -= CircuitHost_UnhandledException;
circuitHost.Client.SetDisconnected();
await circuitHost.DisposeAsync();
}

Expand Down
9 changes: 4 additions & 5 deletions src/Components/Server/test/Circuits/CircuitMetricsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,11 @@ public async Task OnCircuitDown_UpdatesCountersAndRecordsDuration()

// Assert
var activeMeasurements = activeCircuitCounter.GetMeasurementSnapshot();
var connectedMeasurements = connectedCircuitCounter.GetMeasurementSnapshot();
var durationMeasurements = circuitDurationCollector.GetMeasurementSnapshot();

Assert.Single(activeMeasurements);
Assert.Equal(-1, activeMeasurements[0].Value);

Assert.Single(connectedMeasurements);
Assert.Equal(-1, connectedMeasurements[0].Value);

Assert.Single(durationMeasurements);
Assert.True(durationMeasurements[0].Value > 0);
}
Expand Down Expand Up @@ -162,7 +158,10 @@ public void FullCircuitLifecycle_RecordsAllMetricsCorrectly()
// 4. Connection re-established
circuitMetrics.OnConnectionUp();

// 5. Circuit closes
// 5. Connection drops
circuitMetrics.OnConnectionDown();

// 6. Circuit closes
Thread.Sleep(10); // Add a small delay to ensure a measurable duration
var endTime = Stopwatch.GetTimestamp();
circuitMetrics.OnCircuitDown(startTime, endTime);
Expand Down
Loading