kv-client(ticdc): evictAllRegions after close receiveEvents goroutine (…

…#9597) (#9599) close #9595
pingcap · Aug 18, 2023 · 9c7ae61 · 9c7ae61
1 parent 346b526
commit 9c7ae61
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/cdc/kv/client.go b/cdc/kv/client.go
@@ -994,6 +994,7 @@ func (s *eventFeedSession) receiveFromStream(
 	// always create a new region worker, because `receiveFromStream` is ensured
 	// to call exactly once from outer code logic
 	worker := newRegionWorker(parentCtx, s.changefeed, s, addr)
+	defer worker.evictAllRegions()
 
 	ctx, cancel := context.WithCancel(parentCtx)
 	var retErr error

diff --git a/cdc/kv/region_worker.go b/cdc/kv/region_worker.go
@@ -572,7 +572,6 @@ func (w *regionWorker) run() error {
 		for _, h := range w.handles {
 			h.Unregister()
 		}
-		w.evictAllRegions()
 	}()
 	ctx, cancel := context.WithCancel(w.parentCtx)
 	wg, ctx := errgroup.WithContext(ctx)