discovery: properly handle SyncManager shutdown signal
This commit is contained in:
parent
46ceaf8cf6
commit
00338c5ec2
@ -286,6 +286,13 @@ func (m *SyncManager) roundRobinHandler() {
|
|||||||
current = m.nextPendingActiveSyncer()
|
current = m.nextPendingActiveSyncer()
|
||||||
m.Unlock()
|
m.Unlock()
|
||||||
for current != nil {
|
for current != nil {
|
||||||
|
// Ensure we properly handle a shutdown signal.
|
||||||
|
select {
|
||||||
|
case <-m.quit:
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
// We'll avoid performing the transition with the lock
|
// We'll avoid performing the transition with the lock
|
||||||
// as it can potentially stall the SyncManager due to
|
// as it can potentially stall the SyncManager due to
|
||||||
// the syncTransitionTimeout.
|
// the syncTransitionTimeout.
|
||||||
@ -531,6 +538,13 @@ func (m *SyncManager) forceHistoricalSync() {
|
|||||||
candidatesChosen := make(map[routing.Vertex]struct{})
|
candidatesChosen := make(map[routing.Vertex]struct{})
|
||||||
s := m.chooseRandomSyncer(candidatesChosen, true)
|
s := m.chooseRandomSyncer(candidatesChosen, true)
|
||||||
for s != nil {
|
for s != nil {
|
||||||
|
// Ensure we properly handle a shutdown signal.
|
||||||
|
select {
|
||||||
|
case <-m.quit:
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
// Blacklist the candidate to ensure it's not chosen again.
|
// Blacklist the candidate to ensure it's not chosen again.
|
||||||
candidatesChosen[s.cfg.peerPub] = struct{}{}
|
candidatesChosen[s.cfg.peerPub] = struct{}{}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user