Bladeren bron

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

clientv3: automated cherry pick of #10153 to release-3.2
Jingyi Hu 7 jaren geleden
bovenliggende
commit
afa5beda46
1 gewijzigde bestanden met toevoegingen van 3 en 4 verwijderingen
  1. 3 4
      clientv3/concurrency/mutex.go

+ 3 - 4
clientv3/concurrency/mutex.go

@@ -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
-	select {
-	case <-ctx.Done():
+	// release lock key if wait failed
+	if werr != nil {
 		m.Unlock(client.Ctx())
 		m.Unlock(client.Ctx())
-	default:
+	} else {
 		m.hdr = hdr
 		m.hdr = hdr
 	}
 	}
 	return werr
 	return werr