cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

ensure unlock on error

Browse Source
This commit is contained in:
shannonwells 2020-04-22 13:58:26 -07:00
parent 28c5697578
commit f0fec60841
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
paychmgr/simple.go
View File

@ -116,7 +116,7 @@ func (pm *Manager) waitForAddFundsMsg(ctx context.Context, mcid cid.Cid) {
} }
func (pm *Manager) GetPaych(ctx context.Context, from, to address.Address, ensureFree types.BigInt) (address.Address, cid.Cid, error) { func (pm *Manager) GetPaych(ctx context.Context, from, to address.Address, ensureFree types.BigInt) (address.Address, cid.Cid, error) {
pm.store.lk.Lock() pm.store.lk.Lock() // unlock only on err; wait funcs will defer unlock
var mcid cid.Cid var mcid cid.Cid
ch, err := pm.store.findChan(func(ci *ChannelInfo) bool { ch, err := pm.store.findChan(func(ci *ChannelInfo) bool {
if ci.Direction != DirOutbound { if ci.Direction != DirOutbound {
@ -125,6 +125,7 @@ func (pm *Manager) GetPaych(ctx context.Context, from, to address.Address, ensur
return ci.Control == from && ci.Target == to return ci.Control == from && ci.Target == to
}) })
if err != nil { if err != nil {
pm.store.lk.Unlock()
return address.Undef, cid.Undef, xerrors.Errorf("findChan: %w", err) return address.Undef, cid.Undef, xerrors.Errorf("findChan: %w", err)
} }
if ch != address.Undef { if ch != address.Undef {
@ -133,6 +134,8 @@ func (pm *Manager) GetPaych(ctx context.Context, from, to address.Address, ensur
} else { } else {
mcid, err = pm.createPaych(ctx, from, to, ensureFree) mcid, err = pm.createPaych(ctx, from, to, ensureFree)
} }
if err != nil {
pm.store.lk.Unlock()
}
return ch, mcid, err return ch, mcid, err
} }