Fix gossip shutdown hang caused by blocking stop signal#5373
Merged
yacovm merged 1 commit intohyperledger:mainfrom Jan 18, 2026
Merged
Fix gossip shutdown hang caused by blocking stop signal#5373yacovm merged 1 commit intohyperledger:mainfrom
yacovm merged 1 commit intohyperledger:mainfrom
Conversation
c98b5a3 to
5c994c6
Compare
Contributor
Author
yacovm
reviewed
Jan 17, 2026
gossip/gossip/channel/channel.go
Outdated
|
|
||
| func (cache *stateInfoCache) Stop() { | ||
| cache.stopChan <- struct{}{} | ||
| cache.stopOnce.Do(func() { |
Contributor
There was a problem hiding this comment.
There is an easier way of fixing it, without adding the sync.Once.
Just do:
select {
case <- cache.stopChan:
return
default:
close(cache.stopChan)
}
Signed-off-by: remo-lab <remopanda7@gmail.com>
5c994c6 to
ce11aa7
Compare
Contributor
Author
|
Hi @yacovm , |
yacovm
approved these changes
Jan 18, 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.
This PR fixes a shutdown hang in the gossip channel state management logic.
Problem
stateInfoCache.Stop()was using a blocking send on an unbuffered channel:If
Stop()was called while the background goroutine was executingPurge(), the goroutine wasn’t listening onstopChan, causing the send to block indefinitely.This could hang
gossipChannel.Stop()and prevent peers from shutting down cleanly, especially under load.Fix
The stop signaling was updated to use a non-blocking, idempotent close pattern:
sync.Onceguard tostateInfoCacheclose(stopChan)Why this works
close()never blocks, unlike a channel sendsync.Onceensures the channel is closed exactly oncemessageStoreImpl.Stop())Testing
All channel-level tests pass, including shutdown-related coverage:
go test ./gossip/gossip/channel/... -vThis change is minimal, localized, and only affects shutdown behavior by removing the possibility of an indefinite block.