mcs, tso: fix stream Send() and CloseSend() data race issue in TSO pr…

…oxy (#6591) close #6590 No need to call SendClose(), because TSO proxy will cancel the stream context which will cause the corresponding grpc stream on the server side to exit. Signed-off-by: Bin Shi <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
tikv · Jun 13, 2023 · 7158cb3 · 7158cb3
1 parent 7239173
commit 7158cb3
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -411,9 +411,6 @@ func (s *GrpcServer) forwardTSO(stream pdpb.PD_TsoServer) error {
 	)
 	defer func() {
 		s.concurrentTSOProxyStreamings.Add(-1)
-		if forwardStream != nil {
-			forwardStream.CloseSend()
-		}
 		// cancel the forward stream
 		if cancel != nil {
 			cancel()
@@ -452,9 +449,6 @@ func (s *GrpcServer) forwardTSO(stream pdpb.PD_TsoServer) error {
 			return errors.WithStack(ErrNotFoundTSOAddr)
 		}
 		if forwardStream == nil || lastForwardedHost != forwardedHost {
-			if forwardStream != nil {
-				forwardStream.CloseSend()
-			}
 			if cancel != nil {
 				cancel()
 			}