highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-26 17:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9249 from yyforyongyu/fix-shutdown

Browse Source 
routing: fix missionControlStore blocks on shutting down
This commit is contained in:
Oliver Gugger 2024-11-08 11:09:45 +01:00 committed by GitHub
commit 5a8026aba9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/release-notes/release-notes-0.19.0.md
View File

@ -45,6 +45,9 @@
back before the commitment tx was confirmed causing potentially force closes
of the incoming channel.
* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/9249) found in the
mission control store that can block the shutdown process of LND.
# New Features
## Functional Enhancements
## RPC Additions

15
routing/missioncontrol_store.go
View File

@ -50,6 +50,9 @@ type missionControlStore struct {
wg sync.WaitGroup
db missionControlDB
// TODO(yy): Remove the usage of sync.Cond - we are better off using
// channes than a Cond as suggested in the official godoc.
//
// queueCond is signalled when items are put into the queue.
queueCond *sync.Cond
@ -347,8 +350,14 @@ func (b *missionControlStore) run() {
// Wait for the queue to not be empty.
b.queueCond.L.Lock()
for b.queue.Front() == nil {
b.queueCond.Wait()
// To make sure we can properly stop, we must
// read the `done` channel first before
// attempting to call `Wait()`. This is due to
// the fact when `Signal` is called before the
// `Wait` call, the `Wait` call will block
// indefinitely.
//
// TODO(yy): replace this with channels.
select {
case <-b.done:
b.queueCond.L.Unlock()
@ -356,6 +365,8 @@ func (b *missionControlStore) run() {
return
default:
}
b.queueCond.Wait()
}
b.queueCond.L.Unlock()