Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changefeed: Fix changefeed fails immediately after being created successfully. (#2115) #2238

Merged
merged 8 commits into from
Jul 14, 2021
Merged

changefeed: Fix changefeed fails immediately after being created successfully. (#2115) #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca52c66
changefeed: Fix changefeed fails immediately after being created succ…
asddongmen Jul 7, 2021
78abd99
Merge branch 'release-5.1' into cherry-pick-2115-to-release-5.1
ti-chi-bot Jul 9, 2021
3fcb6fb
Merge branch 'release-5.1' into cherry-pick-2115-to-release-5.1
asddongmen Jul 9, 2021
ef3410d
Merge branch 'release-5.1' into cherry-pick-2115-to-release-5.1
ti-chi-bot Jul 14, 2021
22bfdf1
Merge branch 'release-5.1' into cherry-pick-2115-to-release-5.1
ti-chi-bot Jul 14, 2021
b6d16e3
Merge branch 'release-5.1' into cherry-pick-2115-to-release-5.1
ti-chi-bot Jul 14, 2021
75c2135
Merge branch 'release-5.1' into cherry-pick-2115-to-release-5.1
ti-chi-bot Jul 14, 2021
35d3d65
Merge branch 'release-5.1' into cherry-pick-2115-to-release-5.1
ti-chi-bot Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions cdc/owner/changefeed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,9 @@ LOOP:
failpoint.Inject("NewChangefeedNoRetryError", func() {
failpoint.Return(cerror.ErrStartTsBeforeGC.GenWithStackByArgs(checkpointTs-300, checkpointTs))
})

failpoint.Inject("NewChangefeedRetryError", func() {
failpoint.Return(errors.New("failpoint injected retriable error"))
})

if c.state.Info.Config.CheckGCSafePoint {
err := util.CheckSafetyOfStartTs(ctx, ctx.GlobalVars().PDClient, c.state.ID, checkpointTs)
if err != nil {
Expand Down Expand Up @@ -262,10 +260,8 @@ func (c *changefeed) preflightCheck(captures map[model.CaptureID]*model.CaptureI
if status == nil {
status = &model.ChangeFeedStatus{
// the changefeed status is nil when the changefeed is just created.
// the txn in start ts is not replicated at that time,
// so the checkpoint ts and resolved ts should less than start ts.
ResolvedTs: c.state.Info.StartTs - 1,
CheckpointTs: c.state.Info.StartTs - 1,
ResolvedTs: c.state.Info.StartTs,
CheckpointTs: c.state.Info.StartTs,
AdminJobType: model.AdminNone,
}
return status, true, nil
Expand Down
4 changes: 2 additions & 2 deletions cdc/owner/changefeed_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (s *changefeedSuite) TestInitialize(c *check.C) {
// initialize
cf.Tick(ctx, state, captures)
tester.MustApplyPatches()
c.Assert(state.Status.CheckpointTs, check.Equals, ctx.ChangefeedVars().Info.StartTs-1)
c.Assert(state.Status.CheckpointTs, check.Equals, ctx.ChangefeedVars().Info.StartTs)
}

func (s *changefeedSuite) TestHandleError(c *check.C) {
Expand All @@ -186,7 +186,7 @@ func (s *changefeedSuite) TestHandleError(c *check.C) {
// handle error
cf.Tick(ctx, state, captures)
tester.MustApplyPatches()
c.Assert(state.Status.CheckpointTs, check.Equals, ctx.ChangefeedVars().Info.StartTs-1)
c.Assert(state.Status.CheckpointTs, check.Equals, ctx.ChangefeedVars().Info.StartTs)
c.Assert(state.Info.Error.Message, check.Equals, "fake error")
}

Expand Down