mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 09:53:54 +01:00
Code Issues Projects Releases Wiki Activity

chainntnfs: handling for potential deadlocks during system shutdown

Browse Source 
If the lnd daemon is shut down while multiple subsystems are attempting
to register for notifications, the blocking of those chain notifier
registrations may cause the daemon shutdown to deadlock. The additions
in this commit allow the registration functions to return errors rather
than potentially deadlock when the chain notifier is shut down.
This commit is contained in:
bryanvu 2016-12-15 01:07:12 -08:00 committed by Olaoluwa Osuntokun
parent b991cd3d78
commit def39799c5
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chainntnfs/btcdnotify/btcd.go
View File

@ -2,6 +2,7 @@ package btcdnotify
import ( import (
"container/heap" "container/heap"
"errors"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
@ -546,7 +547,12 @@ func (b *BtcdNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint) (*chainntnfs.S
spendChan: make(chan *chainntnfs.SpendDetail, 1), spendChan: make(chan *chainntnfs.SpendDetail, 1),
} }
b.notificationRegistry <- ntfn select {
case <-b.quit:
return nil, errors.New("chainntnfs: system interrupt while " +
"attempting to register for spend notification.")
case b.notificationRegistry <- ntfn:
}
// The following conditional checks to ensure that when a spend notification // The following conditional checks to ensure that when a spend notification
// is registered, the output hasn't already been spent. If the output // is registered, the output hasn't already been spent. If the output
@ -603,12 +609,16 @@ func (b *BtcdNotifier) RegisterConfirmationsNtfn(txid *wire.ShaHash,
negativeConf: make(chan int32, 1), negativeConf: make(chan int32, 1),
} }
b.notificationRegistry <- ntfn select {
case <-b.quit:
return &chainntnfs.ConfirmationEvent{ return nil, errors.New("chainntnfs: system interrupt while " +
Confirmed: ntfn.finConf, "attempting to register for confirmation notification.")
NegativeConf: ntfn.negativeConf, case b.notificationRegistry <- ntfn:
}, nil return &chainntnfs.ConfirmationEvent{
Confirmed: ntfn.finConf,
NegativeConf: ntfn.negativeConf,
}, nil
}
} }
// blockEpochRegistration represents a client's intent to receive a // blockEpochRegistration represents a client's intent to receive a
@ -625,9 +635,13 @@ func (b *BtcdNotifier) RegisterBlockEpochNtfn() (*chainntnfs.BlockEpochEvent, er
epochChan: make(chan *chainntnfs.BlockEpoch, 20), epochChan: make(chan *chainntnfs.BlockEpoch, 20),
} }
b.notificationRegistry <- registration select {
case <-b.quit:
return &chainntnfs.BlockEpochEvent{ return nil, errors.New("chainntnfs: system interrupt while " +
Epochs: registration.epochChan, "attempting to register for block epoch notification.")
}, nil case b.notificationRegistry <- registration:
return &chainntnfs.BlockEpochEvent{
Epochs: registration.epochChan,
}, nil
}
} }