This is an automated cherry-pick of pingcap#5186

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Apr 19, 2022 · e59ae27 · e59ae27
1 parent 4f714e1
commit e59ae27
Show file tree

Hide file tree

Showing 4 changed files with 515 additions and 13 deletions.
diff --git a/cdc/owner/ddl_sink.go b/cdc/owner/ddl_sink.go
@@ -222,5 +222,8 @@ func (s *ddlSinkImpl) close(ctx context.Context) (err error) {
 		err = s.syncPointStore.Close()
 	}
 	s.wg.Wait()
-	return err
+	if err != nil && errors.Cause(err) != context.Canceled {
+		return err
+	}
+	return nil
 }