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

lnd: perform HTLC forwarding to switch in distinct goroutine

Browse Source 
This commit optimizes the previous deadlock bug-fix within the peer’s
channelManager which handles driving the LCP state machine with
additional context-specific state.

Rather than forwarding to the HTLC switch within the primary loop which
handles fully locked-in HTLCs, we now launch a distinct goroutine which
is responsible for properly forwarding lock-in HTLC’s to the
htlcSwitch.
This commit is contained in:
Olaoluwa Osuntokun 2016-08-03 11:29:14 -07:00
parent e5b6270465
commit fc16159a37
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
peer.go
View File

@ -235,7 +235,6 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
plexChan := p.server.htlcSwitch.RegisterLink(p, plexChan := p.server.htlcSwitch.RegisterLink(p,
dbChan.Snapshot(), downstreamLink) dbChan.Snapshot(), downstreamLink)
// TODO(roasbeef): buffer?
upstreamLink := make(chan lnwire.Message, 10) upstreamLink := make(chan lnwire.Message, 10)
p.htlcManagers[chanPoint] = upstreamLink p.htlcManagers[chanPoint] = upstreamLink
p.wg.Add(1) p.wg.Add(1)
@ -983,6 +982,7 @@ func (p *peer) handleUpstreamMsg(state *commitmentState, msg lnwire.Message) {
if state.numUnAcked > 0 { if state.numUnAcked > 0 {
state.numUnAcked -= 1 state.numUnAcked -= 1
// TODO(roasbeef): only start if numUnacked == 0?
state.logCommitTimer = time.Tick(300 * time.Millisecond) state.logCommitTimer = time.Tick(300 * time.Millisecond)
} else { } else {
if _, err := p.updateCommitTx(state); err != nil { if _, err := p.updateCommitTx(state); err != nil {
@ -1012,16 +1012,24 @@ func (p *peer) handleUpstreamMsg(state *commitmentState, msg lnwire.Message) {
return return
} }
// We perform the HTLC forwarding to the switch in a distinct
// goroutine in order not to block the post-processing of
// HTLC's that are eligble for forwarding.
go func() {
for _, htlc := range htlcsToForward {
// Send this fully activated HTLC to the htlc switch to
// continue the chained clear/settle.
state.switchChan <- p.logEntryToHtlcPkt(htlc)
}
}()
// If any of the htlc's eligible for forwarding are pending // If any of the htlc's eligible for forwarding are pending
// settling or timeing out previous outgoing payments, then we // settling or timeing out previous outgoing payments, then we
// can them from the pending set, and signal the requster (if // can them from the pending set, and signal the requster (if
// existing) that the payment has been fully fulfilled. // existing) that the payment has been fully fulfilled.
numSettled := 0 numSettled := 0
for _, htlc := range htlcsToForward { for _, htlc := range htlcsToForward {
// Send this fully activated HTLC to the htlc switch to
// continue the chained clear/settle.
state.switchChan <- p.logEntryToHtlcPkt(htlc)
if p, ok := state.clearedHTCLs[htlc.ParentIndex]; ok { if p, ok := state.clearedHTCLs[htlc.ParentIndex]; ok {
p.err <- nil p.err <- nil
delete(state.clearedHTCLs, htlc.ParentIndex) delete(state.clearedHTCLs, htlc.ParentIndex)