Merge branch 'master' into sche-redirect9

tikv · Nov 7, 2023 · 860ea5c · 860ea5c
2 parents b8f59a1 + 356066a
commit 860ea5c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -2632,7 +2632,13 @@ func (s *GrpcServer) getGlobalTSOFromTSOServer(ctx context.Context) (pdpb.Timest
 		if err != nil {
 			return pdpb.Timestamp{}, err
 		}
-		forwardStream.Send(request)
+		err := forwardStream.Send(request)
+		if err != nil {
+			s.tsoClientPool.Lock()
+			delete(s.tsoClientPool.clients, forwardedHost)
+			s.tsoClientPool.Unlock()
+			continue
+		}
 		ts, err = forwardStream.Recv()
 		if err != nil {
 			if strings.Contains(err.Error(), errs.NotLeaderErr) {