Merge branch 'release-6.5' into cherry-pick-8948-to-release-6.5

tikv · Jan 27, 2025 · ebdf9e3 · ebdf9e3
2 parents 80a7fec + fd9f899
commit ebdf9e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/OWNERS b/OWNERS
@@ -22,5 +22,6 @@ reviewers:
   - BusyJay
   - howardlau1999
   - Luffbee
+  - okJiang
   - shafreeck
   - xhebox
diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -227,13 +227,18 @@ type tsoRequest struct {
 }
 
 func (s *GrpcServer) dispatchTSORequest(ctx context.Context, request *tsoRequest, forwardedHost string, doneCh <-chan struct{}, errCh chan<- error) {
-	tsoRequestChInterface, loaded := s.tsoDispatcher.LoadOrStore(forwardedHost, make(chan *tsoRequest, maxMergeTSORequests))
+	val, loaded := s.tsoDispatcher.Load(forwardedHost)
+	if !loaded {
+		val = make(chan *tsoRequest, maxMergeTSORequests)
+		val, loaded = s.tsoDispatcher.LoadOrStore(forwardedHost, val)
+	}
+	reqCh := val.(chan *tsoRequest)
 	if !loaded {
 		tsDeadlineCh := make(chan deadline, 1)
-		go s.handleDispatcher(ctx, forwardedHost, tsoRequestChInterface.(chan *tsoRequest), tsDeadlineCh, doneCh, errCh)
+		go s.handleDispatcher(ctx, forwardedHost, reqCh, tsDeadlineCh, doneCh, errCh)
 		go watchTSDeadline(ctx, tsDeadlineCh)
 	}
-	tsoRequestChInterface.(chan *tsoRequest) <- request
+	reqCh <- request
 }
 
 func (s *GrpcServer) handleDispatcher(ctx context.Context, forwardedHost string, tsoRequestCh <-chan *tsoRequest, tsDeadlineCh chan<- deadline, doneCh <-chan struct{}, errCh chan<- error) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,5 +22,6 @@ reviewers: @@
       - BusyJay
       - howardlau1999
       - Luffbee
+      - okJiang
       - shafreeck
       - xhebox