After winning a campaign, the call to waitDeletes was missing a

slash after the key prefix. The result was deadlock due to waiting on wrong keys. Fixes #6278
etcd-io · Aug 28, 2016 · bdd89f1 · bdd89f1
1 parent c388b2f
commit bdd89f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go
@@ -70,7 +70,7 @@ func (e *Election) Campaign(ctx context.Context, val string) error {
 		}
 	}
 
-	err = waitDeletes(ctx, client, e.keyPrefix, v3.WithPrefix(), v3.WithRev(e.leaderRev-1))
+	err = waitDeletes(ctx, client, e.keyPrefix+"/", v3.WithPrefix(), v3.WithRev(e.leaderRev-1))
 	if err != nil {
 		// clean up in case of context cancel
 		select {

diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go
@@ -57,7 +57,7 @@ func (m *Mutex) Lock(ctx context.Context) error {
 	}
 
 	// wait for deletion revisions prior to myKey
-	err = waitDeletes(ctx, client, m.pfx, v3.WithPrefix(), v3.WithRev(m.myRev-1))
+	err = waitDeletes(ctx, client, m.pfx+"/", v3.WithPrefix(), v3.WithRev(m.myRev-1))
 	// release lock key if cancelled
 	select {
 	case <-ctx.Done():