Skip to content

Commit 59cf596

Browse files
remo-labremo-lab
andauthored
fix(gossip): stop membership tracker ticker on channel shutdown (#5364)
Signed-off-by: remo-lab <[email protected]> Co-authored-by: remo-lab <[email protected]>
1 parent 850ed38 commit 59cf596

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

gossip/gossip/channel/channel.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ func NewGossipChannel(pkiID common.PKIidType, org api.OrgIdentityType, mcs api.M
295295
getPeersToTrack: gc.GetPeers,
296296
report: gc.reportMembershipChanges,
297297
stopChan: make(chan struct{}, 1),
298+
ticker: ticker,
298299
tickerChannel: ticker.C,
299300
metrics: metrics,
300301
chainID: channelID,
@@ -314,6 +315,9 @@ func (gc *gossipChannel) reportMembershipChanges(input ...interface{}) {
314315
func (gc *gossipChannel) Stop() {
315316
close(gc.stopChan)
316317
close(gc.membershipTracker.stopChan)
318+
if gc.membershipTracker.ticker != nil {
319+
gc.membershipTracker.ticker.Stop()
320+
}
317321
gc.blocksPuller.Stop()
318322
gc.stateInfoPublishScheduler.Stop()
319323
gc.stateInfoRequestScheduler.Stop()
@@ -1082,6 +1086,7 @@ type membershipTracker struct {
10821086
getPeersToTrack func() []discovery.NetworkMember
10831087
report func(...interface{})
10841088
stopChan chan struct{}
1089+
ticker *time.Ticker
10851090
tickerChannel <-chan time.Time
10861091
metrics *metrics.MembershipMetrics
10871092
chainID common.ChannelID

0 commit comments

Comments
 (0)