aljaz/breez-lnd
1
0
Fork 0
mirror of https://github.com/aljazceru/breez-lnd.git synced 2026-01-20 06:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1681 from cfromknecht/lock-chain-arb-shutdown

Browse Source 
contractcourt/chain_arbitrator: fix potential shutdown race
This commit is contained in:
Olaoluwa Osuntokun
2018-08-08 22:03:53 -07:00
committed by GitHub
parent 61681a59eb 8758671552
commit bb310a3d0d
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contractcourt/chain_arbitrator.go
View File

@@ -448,12 +448,24 @@ func (c *ChainArbitrator) Stop() error {
close(c.quit)
var (
activeWatchers = make(map[wire.OutPoint]*chainWatcher)
activeChannels = make(map[wire.OutPoint]*ChannelArbitrator)
)
// Copy the current set of active watchers and arbitrators to shutdown.
// We don't want to hold the lock when shutting down each watcher or
// arbitrator individually, as they may need to acquire this mutex.
c.Lock()
arbitrators := c.activeChannels
watchers := c.activeWatchers
for chanPoint, watcher := range c.activeWatchers {
activeWatchers[chanPoint] = watcher
}
for chanPoint, arbitrator := range c.activeChannels {
activeChannels[chanPoint] = arbitrator
}
c.Unlock()
for chanPoint, watcher := range watchers {
for chanPoint, watcher := range activeWatchers {
log.Tracef("Attempting to stop ChainWatcher(%v)",
chanPoint)
@@ -462,7 +474,7 @@ func (c *ChainArbitrator) Stop() error {
"ChannelPoint(%v): %v", chanPoint, err)
}
}
for chanPoint, arbitrator := range arbitrators {
for chanPoint, arbitrator := range activeChannels {
log.Tracef("Attempting to stop ChannelArbitrator(%v)",
chanPoint)