Skip to content

Fix #2679: connect/config: only access task.Result if we know it completed #2680

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
mgravell merged 4 commits into from
Jul 21, 2025
Merged

Fix #2679: connect/config: only access task.Result if we know it completed #2680

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e23802
connect/config: only access task.Result if we know it completed
mgravell Mar 19, 2024
ffab4e1
cite PR
mgravell Mar 19, 2024
dd72842
typo
mgravell Mar 19, 2024
1d97397
Merge branch 'main' into issue2679
mgravell Jul 21, 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
1 change: 1 addition & 0 deletions docs/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Current package versions:

## Unreleased
- TLS certificate/`TrustIssuer`: Check EKU in X509 chain checks when validating cerificates ([#2670 by NickCraver](https://github.com/StackExchange/StackExchange.Redis/pull/2670))
- Fix [#2679](https://github.com/StackExchange/StackExchange.Redis/issues/2679) - blocking call in long-running connects ([#2680 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2680))

## 2.7.33

Expand Down
12 changes: 10 additions & 2 deletions src/StackExchange.Redis/ConnectionMultiplexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,8 +705,17 @@ private static ConnectionMultiplexer ConnectImpl(ConfigurationOptions configurat
// note that task has timeouts internally, so it might take *just over* the regular timeout
var task = muxer.ReconfigureAsync(first: true, reconfigureAll: false, log, null, "connect");

if (!task.Wait(muxer.SyncConnectTimeout(true)))
if (task.Wait(muxer.SyncConnectTimeout(true)))
{
// completed promptly - we can check the outcome; hard failures
// (such as password problems) should be reported promptly - it
// won't magically start working
if (!task.Result) throw ExceptionFactory.UnableToConnect(muxer, muxer.failureMessage);
}
else
{
// incomplete - most likely slow initial connection; optionally
// allow a soft failure mode
task.ObserveErrors();
if (muxer.RawConfig.AbortOnConnectFail)
{
Expand All @@ -720,7 +729,6 @@ private static ConnectionMultiplexer ConnectImpl(ConfigurationOptions configurat
}
}

if (!task.Result) throw ExceptionFactory.UnableToConnect(muxer, muxer.failureMessage);
killMe = null;
Interlocked.Increment(ref muxer._connectCompletedCount);

Expand Down