fix(amqp091): close race on BrokerDetails.clientDisconnect - #102
Merged
Conversation
This was referenced May 22, 2026
Closed
miotte
marked this pull request as ready for review
May 28, 2026 23:31
dlawregiets
approved these changes
May 28, 2026
This was referenced May 30, 2026
Contributor
|
Are we still working on this, the lint check is failing. It looks like these changes are a part of other PRs too. |
The connectionWatcher goroutine reads bd.clientDisconnect in its main loop and in the reconnect retry loop, while Disconnect writes it from the caller goroutine. Both sides were plain bool accesses with no synchronization, which the race detector reliably flags during Test_StreamRetry (and several other tests that exercise the Connect/Disconnect path). Switch the field to atomic.Bool, matching the pattern already used for the analogous flag on streamConnectionShim in streamshim.go. The connect() early-out and both watcher loops use Load(); Disconnect uses Store(true). The struct-literal initializer was dropped because atomic.Bool's zero value is already false, and the three test sites that re-set the flag to false on a freshly-constructed BrokerDetails were similarly redundant. Signed-off-by: Michael Otteni <MichaelGOtteni@gmail.com>
* test(amqp091): join connectionWatcher goroutines in teardown Add a sync.WaitGroup to BrokerDetails so the connectionWatcher goroutine started by Connect is joinable, and a stopWatcher test helper that disconnects a client and waits for its watcher to exit. Defer it in every Connect-based test so a watcher can no longer outlive its test and either race the package-level NewAmqpConn091 swap (read in connect()) or panic calling IsClosed() on a stale mock from its 30s fallback branch. --------- Signed-off-by: Michael Otteni <MichaelGOtteni@gmail.com>
The stopWatcher teardown line added in #109 pushed the near-identical Test_ClientExists/Test_ClientExists_false pair over golangci-lint's dupl threshold. Collapse them into one table-driven test so the shared setup lives in a single place. Signed-off-by: Michael Otteni <MichaelGOtteni@gmail.com>
Contributor
Author
|
merged PR #104 and rebased this on top of main and resolved conflicts as well as the test |
rsperl
approved these changes
Jun 10, 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
4 participants
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 #101
Switch
BrokerDetails.clientDisconnectfrombooltoatomic.Boolso theconnectionWatchergoroutine and theDisconnectcaller can no longer race, mirroring the pattern already used instreamshim.go.