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

htlcswitch/switch: synchronous stop of links after removal

Browse Source
This commit is contained in:
Conner Fromknecht 2018-07-12 17:39:27 -07:00 committed by Conner Fromknecht
parent 258019eb24
commit c78e81d32b
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
htlcswitch/switch.go
View File

@ -1380,21 +1380,34 @@ func (s *Switch) htlcForwarder() {
s.blockEpochStream.Cancel() s.blockEpochStream.Cancel()
// Remove all links once we've been signalled for shutdown. // Remove all links once we've been signalled for shutdown.
var linksToStop []ChannelLink
s.indexMtx.Lock() s.indexMtx.Lock()
for _, link := range s.linkIndex { for _, link := range s.linkIndex {
if err := s.removeLink(link.ChanID()); err != nil { activeLink := s.removeLink(link.ChanID())
log.Errorf("unable to remove "+ if activeLink == nil {
"channel link on stop: %v", err) log.Errorf("unable to remove ChannelLink(%v) "+
"on stop", link.ChanID())
continue
} }
linksToStop = append(linksToStop, activeLink)
} }
for _, link := range s.pendingLinkIndex { for _, link := range s.pendingLinkIndex {
if err := s.removeLink(link.ChanID()); err != nil { pendingLink := s.removeLink(link.ChanID())
log.Errorf("unable to remove pending "+ if pendingLink == nil {
"channel link on stop: %v", err) log.Errorf("unable to remove ChannelLink(%v) "+
"on stop", link.ChanID())
continue
} }
linksToStop = append(linksToStop, pendingLink)
} }
s.indexMtx.Unlock() s.indexMtx.Unlock()
// Now that all pending and live links have been removed from
// the forwarding indexes, stop each one before shutting down.
for _, link := range linksToStop {
link.Stop()
}
// Before we exit fully, we'll attempt to flush out any // Before we exit fully, we'll attempt to flush out any
// forwarding events that may still be lingering since the last // forwarding events that may still be lingering since the last
// batch flush. // batch flush.
@ -1868,24 +1881,28 @@ func (s *Switch) getLinkByShortID(chanID lnwire.ShortChannelID) (ChannelLink, er
return link, nil return link, nil
} }
// RemoveLink is used to initiate the handling of the remove link command. The // RemoveLink purges the switch of any link associated with chanID. If a pending
// request will be propagated/handled to/in the main goroutine. // or active link is not found, this method does nothing. Otherwise, the method
func (s *Switch) RemoveLink(chanID lnwire.ChannelID) error { // returns after the link has been completely shutdown.
func (s *Switch) RemoveLink(chanID lnwire.ChannelID) {
s.indexMtx.Lock() s.indexMtx.Lock()
defer s.indexMtx.Unlock() link := s.removeLink(chanID)
s.indexMtx.Unlock()
return s.removeLink(chanID) if link != nil {
link.Stop()
}
} }
// removeLink is used to remove and stop the channel link. // removeLink is used to remove and stop the channel link.
// //
// NOTE: This MUST be called with the indexMtx held. // NOTE: This MUST be called with the indexMtx held.
func (s *Switch) removeLink(chanID lnwire.ChannelID) error { func (s *Switch) removeLink(chanID lnwire.ChannelID) ChannelLink {
log.Infof("Removing channel link with ChannelID(%v)", chanID) log.Infof("Removing channel link with ChannelID(%v)", chanID)
link, err := s.getLink(chanID) link, err := s.getLink(chanID)
if err != nil { if err != nil {
return err return nil
} }
// Remove the channel from live link indexes. // Remove the channel from live link indexes.
@ -1906,9 +1923,7 @@ func (s *Switch) removeLink(chanID lnwire.ChannelID) error {
} }
} }
go link.Stop() return link
return nil
} }
// UpdateShortChanID updates the short chan ID for an existing channel. This is // UpdateShortChanID updates the short chan ID for an existing channel. This is