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

Jump to bottom

owner: check update safepoint error #1282

Merged
merged 40 commits into from
Jan 28, 2021
Merged

owner: check update safepoint error #1282

merged 40 commits into from
Jan 28, 2021

Conversation

liuzix
Copy link
Contributor

@liuzix liuzix commented Jan 6, 2021 •
edited
Loading

What problem does this PR solve?

  • CDC does not fail in time after service safepoint is lost.
  • CDC sometimes returns TiKV errors to the user, which is confusing.

What is changed and how it works?

  • Owner now checks whether updating service safepoint is successful, and, if not, throws the appropriate error.
  • Wrapping TiKV errors with appropriate CDC errors.

Check List

Tests

  • Integration test

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release note

  • Check update safepoint error.

@liuzix liuzix added status/WIP type/bugfix This PR fixes a bug. component/replica-model Replication model component. labels Jan 6, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Jan 8, 2021

/run-all-tests

@liuzix
Copy link
Contributor Author

liuzix commented Jan 8, 2021

/run-all-tests

@liuzix
Copy link
Contributor Author

liuzix commented Jan 8, 2021

/run-all-tests

@liuzix
Copy link
Contributor Author

liuzix commented Jan 8, 2021

/run-all-tests

1 similar comment
@liuzix
Copy link
Contributor Author

liuzix commented Jan 8, 2021

/run-all-tests

@liuzix
Copy link
Contributor Author

liuzix commented Jan 8, 2021

/run-all-tests

@liuzix
Copy link
Contributor Author

liuzix commented Jan 8, 2021

/run-all-tests

@liuzix
Copy link
Contributor Author

liuzix commented Jan 9, 2021

/run-all-tests

@liuzix
Copy link
Contributor Author

liuzix commented Jan 9, 2021

/run-all-tests

@codecov-io
Copy link

codecov-io commented Jan 9, 2021 •
edited
Loading

Codecov Report

Merging #1282 (4021292) into master (503f18e) will increase coverage by 0.1978%.
The diff coverage is 69.4444%.

@@               Coverage Diff                @@
##             master      #1282        +/-   ##
================================================
+ Coverage   47.4396%   47.6374%   +0.1978%     
================================================
  Files           130        130                
  Lines         13162      13185        +23     
================================================
+ Hits           6244       6281        +37     
+ Misses         6246       6229        -17     
- Partials        672        675         +3

@liuzix
Copy link
Contributor Author

liuzix commented Jan 11, 2021

/run-all-tests

@liuzix liuzix added status/ptal Could you please take a look? needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-5.0-rc and removed status/WIP labels Jan 11, 2021
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jan 27, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 27, 2021
@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 1343
  • 1345

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@liuzix merge failed.

@amyangfei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 1345
  • 1343
  • 1332

@liuzix
Copy link
Contributor Author

liuzix commented Jan 27, 2021

/run-all-tests

@ti-srebot
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 1338

@amyangfei
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@liuzix merge failed.

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@liuzix merge failed.

@amyangfei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@amyangfei amyangfei added this to the v4.0.11 milestone Jan 28, 2021
@ti-srebot ti-srebot merged commit 9817ce8 into pingcap:master Jan 28, 2021
ti-srebot pushed a commit to ti-srebot/ticdc that referenced this pull request Jan 28, 2021
@liuzix @ti-srebot
cherry pick pingcap#1282 to release-4.0
8b82aa1 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jan 28, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #1367

ti-srebot added a commit that referenced this pull request Jan 28, 2021
@ti-srebot
owner: check update safepoint error (#1282) (#1367)
e3b93d6 
Signed-off-by: ti-srebot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei left review comments

@overvenus overvenus overvenus left review comments

@zier-one zier-one zier-one left review comments

@ti-srebot ti-srebot ti-srebot approved these changes

Assignees
No one assigned
Labels
component/replica-model Replication model component. needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/ptal Could you please take a look? type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
v4.0.11
Development

Successfully merging this pull request may close these issues.
6 participants
@liuzix @codecov-io @amyangfei @ti-srebot @overvenus @zier-one