Skip to content

Fix reconnect getting stuck #758

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 3 commits into from
Mar 7, 2025
Merged

Fix reconnect getting stuck #758

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
d64915f
Fix reconnect getting stuck
mtmk Mar 5, 2025
622eb59
Fix connect pong timeout
mtmk Mar 7, 2025
aff61b9
Merge branch 'main' into fix-reconnect
mtmk Mar 7, 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
2 changes: 2 additions & 0 deletions src/NATS.Client.Core/Internal/NatsReadProtocolProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,9 @@ await _connection.PublishToClientHandlersAsync(subject, replyTo, sid, headerSlic
}
catch (SocketClosedException e)
{
_logger.LogDebug(NatsLogEvents.Protocol, e, "Socket closed during read loop");
_waitForInfoSignal.TrySetException(e);
_waitForPongOrErrorSignal.TrySetException(e);
return;
}
catch (Exception ex)
Expand Down
12 changes: 11 additions & 1 deletion src/NATS.Client.Core/NatsConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,17 @@ private async ValueTask SetupReaderWriterAsync(bool reconnect)
}

// receive COMMAND response (PONG or ERROR)
await waitForPongOrErrorSignal.Task.ConfigureAwait(false);
try
{
await waitForPongOrErrorSignal.Task
.WaitAsync(Opts.ConnectTimeout)
.ConfigureAwait(false);
}
catch (TimeoutException)
{
_logger.LogDebug(NatsLogEvents.Connection, "Timeout waiting for initial pong");
throw;
}

if (reconnectTask != null)
{
Expand Down