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

config(dm): fix can't downgrade config #4936

Merged
merged 4 commits into from
Mar 17, 2022
Merged

config(dm): fix can't downgrade config #4936

merged 4 commits into from
Mar 17, 2022

Conversation

lance6716
Copy link
Contributor

Signed-off-by: lance6716 lance6716@gmail.com

What problem does this PR solve?

Issue Number: ref #4287

What is changed and how it works?

fix failed CI https://github.com/pingcap/tiflow/actions/workflows/upgrade_dm_via_tiup.yaml

Check List

Tests

  • Integration test

Code changes

  • Has exported function/method change

Related changes

  • Need to cherry-pick to the release branch

Release note 

`None`.

@lance6716
config(dm): fix can't downgrade config
77cb1ef 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 17, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • WizardXiao

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 release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 17, 2022
@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Mar 17, 2022
@lance6716
Copy link
Contributor Author

https://github.com/pingcap/tiflow/actions/runs/1997947623

ci passed

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 17, 2022
@codecov-commenter
Copy link

codecov-commenter commented Mar 17, 2022 •
edited
Loading

Codecov Report

Merging #4936 (4e1797e) into master (687e248) will decrease coverage by 0.3289%.
The diff coverage is 59.6831%.

Flag Coverage Δ
cdc 60.8703% <52.7777%> (+0.2716%) ⬆️
dm 51.7520% <63.3783%> (-0.7175%) ⬇️

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

@@               Coverage Diff                @@
##             master      #4936        +/-   ##
================================================
- Coverage   56.1240%   55.7950%   -0.3290%     
================================================
  Files           522        524         +2     
  Lines         65325      66755      +1430     
================================================
+ Hits          36663      37246       +583     
- Misses        25094      25841       +747     
- Partials       3568       3668       +100

GMHDBJD
GMHDBJD approved these changes Mar 17, 2022
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 17, 2022
@GMHDBJD
Copy link
Contributor

GMHDBJD commented Mar 17, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4e1797e

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

/run-dm-integration-test

@lance6716
fix CI
3bd6be1 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 17, 2022
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 3bd6be1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 17, 2022
@lance6716
revert some config change :P
f553eb2 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 17, 2022
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f553eb2

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

/run-verify

@ti-chi-bot ti-chi-bot merged commit d61f8e0 into pingcap:master Mar 17, 2022
@lance6716 lance6716 deleted the fix-downgrade-ci branch October 13, 2022 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WizardXiao WizardXiao WizardXiao approved these changes

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees
No one assigned
Labels
area/dm Issues or PRs related to DM. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lance6716 @ti-chi-bot @codecov-commenter @GMHDBJD @WizardXiao