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

htlcswitch: add quit case to initial channel state sync select in channelLink

Browse Source 
In this commit we add a quit case to the select statement that’s
entered once a link is created. Before this commit, upon restart it
would be possible that the deamon would never ben able to shutdown as
the link would be waiting for the messages to be sent by the other
side.
This commit is contained in:
Olaoluwa Osuntokun 2017-11-10 19:37:47 -08:00
parent 6f51b941df
commit 632f230fef
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htlcswitch/link.go
View File

@ -297,7 +297,10 @@ func (l *channelLink) Stop() {
// //
// NOTE: This MUST be run as a goroutine. // NOTE: This MUST be run as a goroutine.
func (l *channelLink) htlcManager() { func (l *channelLink) htlcManager() {
defer l.wg.Done() defer func() {
l.wg.Done()
log.Infof("ChannelLink(%v) has exited", l)
}()
log.Infof("HTLC manager for ChannelPoint(%v) started, "+ log.Infof("HTLC manager for ChannelPoint(%v) started, "+
"bandwidth=%v", l.channel.ChannelPoint(), l.Bandwidth()) "bandwidth=%v", l.channel.ChannelPoint(), l.Bandwidth())
@ -367,6 +370,8 @@ func (l *channelLink) htlcManager() {
// In any case, we'll then process their ChanSync // In any case, we'll then process their ChanSync
// message. // message.
l.handleUpstreamMsg(msg) l.handleUpstreamMsg(msg)
case <-l.quit:
return
case <-chanSyncDeadline: case <-chanSyncDeadline:
l.fail("didn't receive ChannelReestablish before " + l.fail("didn't receive ChannelReestablish before " +
"deadline") "deadline")
@ -534,8 +539,6 @@ out:
break out break out
} }
} }
log.Infof("ChannelLink(%v) has exited", l)
} }
// handleDownStreamPkt processes an HTLC packet sent from the downstream HTLC // handleDownStreamPkt processes an HTLC packet sent from the downstream HTLC