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

chainntnfs/neutrinonotify: async call GetUtxo from RegisterSpendNtfn

Browse Source 
Since GetUtxo is a potentially long running call, we would see
RegisterSpendNtfn block in some cases, in particular on starting the
chain watcher, causing lnd to hang on startup.

This commit makes the call to GetUtxo in a go routine, letting
RegisterSpendNtfn return immediately when the notification events are
created.
This commit is contained in:
Johan T. Halseth 2019-06-04 09:58:04 +02:00
parent 4068e78af6
commit 3a44574625
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
chainntnfs/neutrinonotify/neutrino.go
View File

@ -740,10 +740,14 @@ func (n *NeutrinoNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
} }
// With the filter updated, we'll dispatch our historical rescan to // With the filter updated, we'll dispatch our historical rescan to
// ensure we detect the spend if it happened in the past. We'll ensure // ensure we detect the spend if it happened in the past.
// that neutrino is caught up to the starting height before we attempt n.wg.Add(1)
// to fetch the UTXO from the chain. If we're behind, then we may miss a go func() {
// notification dispatch. defer n.wg.Done()
// We'll ensure that neutrino is caught up to the starting
// height before we attempt to fetch the UTXO from the chain.
// If we're behind, then we may miss a notification dispatch.
for { for {
n.bestBlockMtx.RLock() n.bestBlockMtx.RLock()
currentHeight := uint32(n.bestBlock.Height) currentHeight := uint32(n.bestBlock.Height)
@ -753,7 +757,11 @@ func (n *NeutrinoNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
break break
} }
time.Sleep(time.Millisecond * 200) select {
case <-time.After(time.Millisecond * 200):
case <-n.quit:
return
}
} }
spendReport, err := n.p2pNode.GetUtxo( spendReport, err := n.p2pNode.GetUtxo(
@ -767,7 +775,8 @@ func (n *NeutrinoNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
neutrino.QuitChan(n.quit), neutrino.QuitChan(n.quit),
) )
if err != nil && !strings.Contains(err.Error(), "not found") { if err != nil && !strings.Contains(err.Error(), "not found") {
return nil, err chainntnfs.Log.Errorf("Failed getting UTXO: %v", err)
return
} }
// If a spend report was returned, and the transaction is present, then // If a spend report was returned, and the transaction is present, then
@ -790,8 +799,10 @@ func (n *NeutrinoNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
// blocks. // blocks.
err = n.txNotifier.UpdateSpendDetails(spendRequest, spendDetails) err = n.txNotifier.UpdateSpendDetails(spendRequest, spendDetails)
if err != nil { if err != nil {
return nil, err chainntnfs.Log.Errorf("Failed to update spend details: %v", err)
return
} }
}()
return ntfn.Event, nil return ntfn.Event, nil
} }