fix(gossip): prevent stateInfoCache.Stop() from blocking

remo-lab · remo-lab · commit 5c994c6af582 · 2026-01-17T22:19:58.000+05:30
Signed-off-by: remo-lab &lt;remopanda7@gmail.com&gt;
diff --git a/gossip/gossip/channel/channel.go b/gossip/gossip/channel/channel.go
@@ -1030,6 +1030,7 @@ type stateInfoCache struct {
 	*util.MembershipStore
 	msgstore.MessageStore
 	stopChan chan struct{}
+	stopOnce sync.Once
 }
 
 func (cache *stateInfoCache) validate(orgs []api.OrgIdentityType) {
@@ -1068,7 +1069,9 @@ func (cache *stateInfoCache) delete(msg *protoext.SignedGossipMessage) {
 }
 
 func (cache *stateInfoCache) Stop() {
-	cache.stopChan <- struct{}{}
+	cache.stopOnce.Do(func() {
+		close(cache.stopChan)
+	})
 }
 
 // GenerateMAC returns a byte slice that is derived from the peer's PKI-ID

Original file line number	Diff line number	Diff line change
`@@ -1030,6 +1030,7 @@ type stateInfoCache struct {`
`1030`	`1030`	`*util.MembershipStore`
`1031`	`1031`	`msgstore.MessageStore`
`1032`	`1032`	`stopChan chan struct{}`
	`1033`	`+ stopOnce sync.Once`
`1033`	`1034`	`}`
`1034`	`1035`
`1035`	`1036`	`func (cache *stateInfoCache) validate(orgs []api.OrgIdentityType) {`
`@@ -1068,7 +1069,9 @@ func (cache stateInfoCache) delete(msg protoext.SignedGossipMessage) {`
`1068`	`1069`	`}`
`1069`	`1070`
`1070`	`1071`	`func (cache *stateInfoCache) Stop() {`
`1071`		`- cache.stopChan <- struct{}{}`
	`1072`	`+ cache.stopOnce.Do(func() {`
	`1073`	`+ close(cache.stopChan)`
	`1074`	`+ })`
`1072`	`1075`	`}`
`1073`	`1076`
`1074`	`1077`	`// GenerateMAC returns a byte slice that is derived from the peer's PKI-ID`