fix(connections): cancelled connect no longer aborts a later successful connection (#1358)#1367
Merged
Merged
Conversation
… changelog spelling, add session-switch test
Signed-off-by: Ngô Quốc Đạt <datlechin@gmail.com>
This was referenced May 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1358.
Cancelling a pending connection only marked the Swift
Taskcancelled; the blockingPQconnectdbkept running. When the host later became reachable, the cancelledconnectToSessionresumed and, with no cancellation guard, mutatedactiveSessions[connectionId], which by then belonged to the new successful attempt: either overwriting its driver or removing the live session.Changes
connectToSessionchecksTask.isCancelledafterconnect()and before the session write. This is the actual fix.connect()now uses the cancellable dispatch helper, which only short-circuits a cancel that lands before dispatch; it does not interrupt an in-flight blockingPQconnectdb, so theTask.isCancelledchecks are what guarantee correctness.Tests
CancelledConnectionCleanupTests: a cancelled attempt leaves the session intact; a genuine failure removes it and either clearscurrentSessionIdor moves it to a remaining session. The race is timing-dependent, so these pin the extracted cleanup helper's behaviour rather than reproducing the race. All pass.Known follow-up
Cancelling a tunnelled connection without retrying can leave the SSH tunnel up until a later attempt replaces it. Tracked separately.