Merge branch 'master' into enable-new-sched-by-default

pingcap · Mar 11, 2022 · 76fe383 · 76fe383
2 parents 17517a0 + b3655c8
commit 76fe383
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/cdc/sink/mysql.go b/cdc/sink/mysql.go
@@ -404,6 +404,15 @@ func (s *mysqlSink) createSinkWorkers(ctx context.Context) error {
 }
 
 func (s *mysqlSink) notifyAndWaitExec(ctx context.Context) {
+	// notifyAndWaitExec may return because of context cancellation,
+	// and s.flushSyncWg.Wait() goroutine is still running, check context first to
+	// avoid data race
+	select {
+	case <-ctx.Done():
+		log.Warn("context is done", zap.Error(ctx.Err()))
+		return
+	default:
+	}
 	s.broadcastFinishTxn()
 	s.execWaitNotifier.Notify()
 	done := make(chan struct{})