Merge pull request #10163 from jingyih/automated-cherry-pick-of-#1015…

…3-origin-release-3.1 clientv3: automated cherry pick of #10153 to release 3.1
etcd-io · Oct 9, 2018 · 3e99b42 · 3e99b42
2 parents 65fff06 + cf7be48
commit 3e99b42
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go
@@ -58,11 +58,9 @@ func (m *Mutex) Lock(ctx context.Context) error {
 
 	// wait for deletion revisions prior to myKey
 	err = waitDeletes(ctx, client, m.pfx, m.myRev-1)
-	// release lock key if cancelled
-	select {
-	case <-ctx.Done():
+	// release lock key if wait failed
+	if err != nil {
 		m.Unlock(client.Ctx())
-	default:
 	}
 	return err
 }