Skip to content

Fix CommandWrite dispose fix #936

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
mtmk merged 1 commit into from
Aug 20, 2025
+20 −6
Merged

Fix CommandWrite dispose fix #936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 20 additions & 6 deletions src/NATS.Client.Core/Commands/CommandWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ internal sealed class CommandWriter : IAsyncDisposable
// https://github.com/nats-io/nats.net/pull/383#discussion_r1484344102
private const int MinSegmentSize = 16384;

private static readonly TimeSpan ReaderLoopDisposeTimeout = TimeSpan.FromSeconds(5);
private readonly ILogger<CommandWriter> _logger;
private readonly bool _trace;
private readonly string _name;
Expand Down Expand Up @@ -158,13 +159,8 @@ public async ValueTask DisposeAsync()

#if NET8_0_OR_GREATER
await _cts.CancelAsync().ConfigureAwait(false);
if (_ctsReader != null)
{
await _ctsReader.CancelAsync().ConfigureAwait(false);
}
#else
_cts.Cancel();
_ctsReader?.Cancel();
#endif

_channelLock.Writer.TryComplete();
Expand All @@ -178,7 +174,25 @@ public async ValueTask DisposeAsync()
}

if (readerTask != null)
await readerTask.ConfigureAwait(false);
{
try
{
await readerTask.WaitAsync(ReaderLoopDisposeTimeout).ConfigureAwait(false);
}
catch (TimeoutException)
{
#if NET8_0_OR_GREATER
var ctsReader = _ctsReader;
if (ctsReader != null)
{
await ctsReader.CancelAsync().ConfigureAwait(false);
}
#else
_ctsReader?.Cancel();
#endif
await readerTask.WaitAsync(ReaderLoopDisposeTimeout).ConfigureAwait(false);
}
}
}

public ValueTask ConnectAsync(ClientOpts connectOpts, CancellationToken cancellationToken)
Expand Down
Loading