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 #14875 from BarrensZeppelin/patch-lessor

Browse Source 
lease: fix potential goroutine leak in lessor_test.go
This commit is contained in:
Piotr Tabor 2022-12-19 09:28:50 +01:00 committed by GitHub
commit 04a75b10bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/lease/lessor_test.go
View File

@ -207,6 +207,29 @@ func TestLessorRevoke(t *testing.T) {
}
}
func renew(t *testing.T, le *lessor, id LeaseID) int64 {
ch := make(chan int64, 1)
errch := make(chan error, 1)
go func() {
ttl, err := le.Renew(id)
if err != nil {
errch <- err
} else {
ch <- ttl
}
}()
select {
case ttl := <-ch:
return ttl
case err := <-errch:
t.Fatalf("failed to renew lease (%v)", err)
case <-time.After(10 * time.Second):
t.Fatal("timed out while renewing lease")
}
panic("unreachable")
}
// TestLessorRenew ensures Lessor can renew an existing lease.
func TestLessorRenew(t *testing.T) {
lg := zap.NewNop()
@ -227,10 +250,7 @@ func TestLessorRenew(t *testing.T) {
le.mu.Lock()
l.ttl = 10
le.mu.Unlock()
ttl, err := le.Renew(l.ID)
if err != nil {
t.Fatalf("failed to renew lease (%v)", err)
}
ttl := renew(t, le, l.ID)
if ttl != l.ttl {
t.Errorf("ttl = %d, want %d", ttl, l.ttl)
}
@ -268,10 +288,7 @@ func TestLessorRenewWithCheckpointer(t *testing.T) {
l.ttl = 10
l.remainingTTL = 10
le.mu.Unlock()
ttl, err := le.Renew(l.ID)
if err != nil {
t.Fatalf("failed to renew lease (%v)", err)
}
ttl := renew(t, le, l.ID)
if ttl != l.ttl {
t.Errorf("ttl = %d, want %d", ttl, l.ttl)
}