Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10162 from jingyih/automated-cherry-pick-of-#10153-origin-release-3.2

Browse Source 
clientv3: automated cherry pick of #10153 to release-3.2
This commit is contained in:
Jingyi Hu 2018-10-08 18:38:02 -07:00 committed by GitHub
commit afa5beda46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clientv3/concurrency/mutex.go
View File

@ -69,11 +69,10 @@ func (m *Mutex) Lock(ctx context.Context) error {
// wait for deletion revisions prior to myKey // wait for deletion revisions prior to myKey
hdr, werr := waitDeletes(ctx, client, m.pfx, m.myRev-1) hdr, werr := waitDeletes(ctx, client, m.pfx, m.myRev-1)
// release lock key if cancelled // release lock key if wait failed
select { if werr != nil {
case <-ctx.Done():
m.Unlock(client.Ctx()) m.Unlock(client.Ctx())
default: } else {
m.hdr = hdr m.hdr = hdr
} }
return werr return werr