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

autopilot/agent: protect chanState with mutex

Browse Source 
Since we want to access the current channel state outside the main
autopilot agent goroutine, we make sure it is protected by a mutex.
This commit is contained in:
Johan T. Halseth 2018-12-19 14:54:55 +01:00
parent 8ab718368d
commit cf01879d96
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
autopilot/agent.go
View File

@ -113,7 +113,8 @@ type Agent struct {
cfg Config cfg Config
// chanState tracks the current set of open channels. // chanState tracks the current set of open channels.
chanState channelState chanState channelState
chanStateMtx sync.Mutex
// stateUpdates is a channel that any external state updates that may // stateUpdates is a channel that any external state updates that may
// affect the heuristics of the agent will be sent over. // affect the heuristics of the agent will be sent over.
@ -410,7 +411,9 @@ func (a *Agent) controller() {
spew.Sdump(update.newChan)) spew.Sdump(update.newChan))
newChan := update.newChan newChan := update.newChan
a.chanStateMtx.Lock()
a.chanState[newChan.ChanID] = newChan a.chanState[newChan.ChanID] = newChan
a.chanStateMtx.Unlock()
a.pendingMtx.Lock() a.pendingMtx.Lock()
delete(a.pendingOpens, newChan.Node) delete(a.pendingOpens, newChan.Node)
@ -424,9 +427,11 @@ func (a *Agent) controller() {
"updates: %v", "updates: %v",
spew.Sdump(update.closedChans)) spew.Sdump(update.closedChans))
a.chanStateMtx.Lock()
for _, closedChan := range update.closedChans { for _, closedChan := range update.closedChans {
delete(a.chanState, closedChan) delete(a.chanState, closedChan)
} }
a.chanStateMtx.Unlock()
updateBalance() updateBalance()
} }
@ -472,10 +477,11 @@ func (a *Agent) controller() {
// With all the updates applied, we'll obtain a set of the // With all the updates applied, we'll obtain a set of the
// current active channels (confirmed channels), and also // current active channels (confirmed channels), and also
// factor in our set of unconfirmed channels. // factor in our set of unconfirmed channels.
confirmedChans := a.chanState a.chanStateMtx.Lock()
a.pendingMtx.Lock() a.pendingMtx.Lock()
totalChans := mergeChanState(a.pendingOpens, confirmedChans) totalChans := mergeChanState(a.pendingOpens, a.chanState)
a.pendingMtx.Unlock() a.pendingMtx.Unlock()
a.chanStateMtx.Unlock()
// Now that we've updated our internal state, we'll consult our // Now that we've updated our internal state, we'll consult our
// channel attachment heuristic to determine if we can open // channel attachment heuristic to determine if we can open
@ -514,7 +520,10 @@ func (a *Agent) openChans(availableFunds btcutil.Amount, numChans uint32,
// We're to attempt an attachment so we'll obtain the set of // We're to attempt an attachment so we'll obtain the set of
// nodes that we currently have channels with so we avoid // nodes that we currently have channels with so we avoid
// duplicate edges. // duplicate edges.
a.chanStateMtx.Lock()
connectedNodes := a.chanState.ConnectedNodes() connectedNodes := a.chanState.ConnectedNodes()
a.chanStateMtx.Unlock()
a.pendingMtx.Lock() a.pendingMtx.Lock()
nodesToSkip := mergeNodeMaps(a.pendingOpens, nodesToSkip := mergeNodeMaps(a.pendingOpens,
a.pendingConns, connectedNodes, a.failedNodes, a.pendingConns, connectedNodes, a.failedNodes,