owner(ticdc): Fix a nil pointer access bug when appending DataPatches (…

…#4085) (#4183) close #3128
pingcap · Feb 21, 2022 · 648ce2c · 648ce2c
1 parent 52f828f
commit 648ce2c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/cdc/owner/changefeed.go b/cdc/owner/changefeed.go
@@ -501,6 +501,9 @@ func (c *changefeed) updateStatus(currentTs int64, barrierTs model.Ts) {
 	}
 	c.state.PatchStatus(func(status *model.ChangeFeedStatus) (*model.ChangeFeedStatus, bool, error) {
 		changed := false
+		if status == nil {
+			return nil, changed, nil
+		}
 		if status.ResolvedTs != resolvedTs {
 			status.ResolvedTs = resolvedTs
 			changed = true

diff --git a/cdc/owner/feed_state_manager.go b/cdc/owner/feed_state_manager.go
@@ -300,6 +300,9 @@ func (m *feedStateManager) patchState(feedState model.FeedState) {
 	})
 	m.state.PatchInfo(func(info *model.ChangeFeedInfo) (*model.ChangeFeedInfo, bool, error) {
 		changed := false
+		if info == nil {
+			return nil, changed, nil
+		}
 		if info.State != feedState {
 			info.State = feedState
 			changed = true
@@ -364,6 +367,9 @@ func (m *feedStateManager) handleError(errs ...*model.RunningError) {
 	for _, err := range errs {
 		if cerrors.ChangefeedFastFailErrorCode(errors.RFCErrorCode(err.Code)) {
 			m.state.PatchInfo(func(info *model.ChangeFeedInfo) (*model.ChangeFeedInfo, bool, error) {
+				if info == nil {
+					return nil, false, nil
+				}
 				info.Error = err
 				return info, true, nil
 			})
@@ -374,6 +380,9 @@ func (m *feedStateManager) handleError(errs ...*model.RunningError) {
 	}
 
 	m.state.PatchInfo(func(info *model.ChangeFeedInfo) (*model.ChangeFeedInfo, bool, error) {
+		if info == nil {
+			return nil, false, nil
+		}
 		for _, err := range errs {
 			info.Error = err
 		}