network: fix mesher stopping logic#6406
Merged
algorandskiy merged 2 commits intoalgorand:masterfrom Aug 5, 2025
Merged
Conversation
Originally Mesher relied on a supplied context to handle termination so network's context supposed to be canceled first. wsNetwork's meshThreadInner executes tryConnect asynchronously so that calling it directly from Mesher after possible network termination ends up with tryConnect goroutine still running.
cce
reviewed
Aug 5, 2025
| cfg.meshThreadInterval = meshThreadInterval | ||
| } | ||
|
|
||
| ctx, cancel := context.WithCancel(cfg.parentCtx) |
Contributor
There was a problem hiding this comment.
I am curious, why make a child context and cancel it in baseMesher.stop() if the parent context will be cancelled by the network upstream? or is the issue that for hybridNetwork there is no WithContext() being passed or something
Contributor
Author
There was a problem hiding this comment.
the issue with hybrid is the following (in the original code):
- Stoping wsNet and then the mesher
- In between
wsNet.Stop()andmesher.stop()mesher's goroutine calls directlymeshThreadInnerthat spawns a goroutine fortryConnect - Since
wsNet.Stop()has already executed, nothing checks fortryConnectwait group and the goroutine still alive when the main thread exits.
cce
approved these changes
Aug 5, 2025
gmalouf
approved these changes
Aug 5, 2025
…rid-test-panic-fix
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.
Summary
Originally Mesher relied on a supplied context to handle termination so network's context supposed to be canceled first. wsNetwork's meshThreadInner executes tryConnect asynchronously so that calling it directly from Mesher after possible network termination ends up with tryConnect goroutine still running.
Sample failure: https://github.com/algorand/go-algorand/actions/runs/16656257238/job/47141871869?pr=6397