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

dm: fix empty config cause dm-master panic #5298

Merged
merged 7 commits into from
May 6, 2022
Merged

dm: fix empty config cause dm-master panic #5298

merged 7 commits into from
May 6, 2022

Conversation

GMHDBJD
Copy link
Contributor

@GMHDBJD GMHDBJD commented Apr 27, 2022

What problem does this PR solve?

Issue Number: close #3732

What is changed and how it works?

check rule is empty. If so, the ErrConfigGlobalConfigsUnused will be returned

Tests

  • Integration test

Release note 

fix the issue that empty dump/load/sync config will cause dm-master panic.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 27, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Ehco1996
  • lance6716

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-6.0 Should cherry pick this PR to release-6.0 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 27, 2022
@codecov-commenter
Copy link

codecov-commenter commented Apr 27, 2022 •
edited
Loading

Codecov Report

Merging #5298 (d6fb55d) into master (687e248) will decrease coverage by 0.0454%.
The diff coverage is 56.2195%.

Flag Coverage Δ
cdc 60.8814% <56.2195%> (+0.2828%) ⬆️
dm 52.2579% <ø> (-0.2117%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master      #5298        +/-   ##
================================================
- Coverage   56.1240%   56.0785%   -0.0455%     
================================================
  Files           522        526         +4     
  Lines         65325      69342      +4017     
================================================
+ Hits          36663      38886      +2223     
- Misses        25094      26729      +1635     
- Partials       3568       3727       +159

@GMHDBJD GMHDBJD added status/ptal Could you please take a look? area/dm Issues or PRs related to DM. labels Apr 27, 2022
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Apr 27, 2022

/run-all-tests

Ehco1996
Ehco1996 approved these changes Apr 28, 2022
View reviewed changes
Copy link
Contributor

@Ehco1996 Ehco1996 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 28, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 29, 2022
@lichunzhu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 7cd1aa8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 5, 2022
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented May 6, 2022

/merge

@ti-chi-bot ti-chi-bot merged commit 21608dc into pingcap:master May 6, 2022
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request May 6, 2022
@GMHDBJD @ti-chi-bot
This is an automated cherry-pick of pingcap#5298
0935cff 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request May 6, 2022
Closed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #5336.

@lance6716
Copy link
Contributor

/run-cherry-picker

@lance6716 lance6716 added needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Aug 1, 2022
@lance6716
Copy link
Contributor

/run-cherry-picker

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 1, 2022
@GMHDBJD @ti-chi-bot
This is an automated cherry-pick of pingcap#5298
535f91f 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #6560.

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 1, 2022
Closed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #6561.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 1, 2022
@GMHDBJD @ti-chi-bot
This is an automated cherry-pick of pingcap#5298
b1ef632 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 1, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ehco1996 Ehco1996 Ehco1996 approved these changes

@lance6716 lance6716 lance6716 approved these changes

Assignees
No one assigned
Labels
area/dm Issues or PRs related to DM. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.0 Should cherry pick this PR to release-6.0 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. 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?
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Empty syncer config item cause DM-master panic
6 participants
@GMHDBJD @ti-chi-bot @codecov-commenter @lichunzhu @lance6716 @Ehco1996