From 6a530a177058690e3443273f9d8812df30e2fd7d Mon Sep 17 00:00:00 2001
From: Ryan Leung <rleungx@gmail.com>
Date: Fri, 19 May 2023 17:45:37 +0800
Subject: [PATCH] client: fix the leak of the keyspace watch channel (#6494)

ref tikv/pd#4399

Signed-off-by: Ryan Leung <rleungx@gmail.com>
---
 client/keyspace_client.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/keyspace_client.go b/client/keyspace_client.go
index 218ac404d2f..ec183e5659c 100644
--- a/client/keyspace_client.go
+++ b/client/keyspace_client.go
@@ -91,6 +91,7 @@ func (c *client) WatchKeyspaces(ctx context.Context) (chan []*keyspacepb.Keyspac
 	}
 	go func() {
 		defer func() {
+			close(keyspaceWatcherChan)
 			if r := recover(); r != nil {
 				log.Error("[pd] panic in keyspace client `WatchKeyspaces`", zap.Any("error", r))
 				return
@@ -99,7 +100,6 @@ func (c *client) WatchKeyspaces(ctx context.Context) (chan []*keyspacepb.Keyspac
 		for {
 			select {
 			case <-ctx.Done():
-				close(keyspaceWatcherChan)
 				return
 			default:
 				resp, err := stream.Recv()