Merge pull request #14875 from BarrensZeppelin/patch-lessor

lease: fix potential goroutine leak in lessor_test.go

server/lease/lessor_test.go

@@ -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)
+	ttl := renew(t, le, l.ID)
-	if err != nil {
-		t.Fatalf("failed to renew lease (%v)", err)
-	}
 	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)
+	ttl := renew(t, le, l.ID)
-	if err != nil {
-		t.Fatalf("failed to renew lease (%v)", err)
-	}
 	if ttl != l.ttl {
 		t.Errorf("ttl = %d, want %d", ttl, l.ttl)
 	}