akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4580 from guggero/fundingmgr-mutex

Browse Source 
fundingmanager: hold lock during loop
This commit is contained in:
Oliver Gugger 2020-08-31 14:34:51 +02:00 committed by GitHub
commit 6055b00dbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fundingmanager.go
View File

@ -1206,12 +1206,10 @@ func (f *fundingManager) handleFundingOpen(fmsg *fundingOpenMsg) {
msg := fmsg.msg msg := fmsg.msg
amt := msg.FundingAmount amt := msg.FundingAmount
// We count the number of pending channels for this peer. This is the // We get all pending channels for this peer. This is the list of the
// sum of the active reservations and the channels pending open in the // active reservations and the channels pending open in the database.
// database.
f.resMtx.RLock() f.resMtx.RLock()
reservations := f.activeReservations[peerIDKey] reservations := f.activeReservations[peerIDKey]
f.resMtx.RUnlock()
// We don't count reservations that were created from a canned funding // We don't count reservations that were created from a canned funding
// shim. The user has registered the shim and therefore expects this // shim. The user has registered the shim and therefore expects this
@ -1222,6 +1220,7 @@ func (f *fundingManager) handleFundingOpen(fmsg *fundingOpenMsg) {
numPending++ numPending++
} }
} }
f.resMtx.RUnlock()
// Also count the channels that are already pending. There we don't know // Also count the channels that are already pending. There we don't know
// the underlying intent anymore, unfortunately. // the underlying intent anymore, unfortunately.