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

lightning: do resolve conflict job when other lightning has local dupes (#41157) #41488

Merged
merged 7 commits into from
Feb 17, 2023
Merged

lightning: do resolve conflict job when other lightning has local dupes (#41157) #41488

merged 7 commits into from
Feb 17, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #41157

What problem does this PR solve?

Issue Number: close #40923

Problem Summary:

What is changed and how it works?

do resolve conflict job when other lightning has local dupes.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below
    Manully test failed ti-case.

Side effects

  • None

Documentation

  • None

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fix Lightning may skip resolving conflicts when other lightning meets local dupes while the last one doesn't.

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 16, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • gozssky
  • lichunzhu

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 mentioned this pull request Feb 16, 2023
Merged
3 tasks
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. component/lightning This issue is related to Lightning of TiDB. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Feb 16, 2023
@sleepymole sleepymole mentioned this pull request Feb 16, 2023
Merged
12 tasks
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 17, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 17, 2023
lichunzhu
lichunzhu approved these changes Feb 17, 2023
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu 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 Feb 17, 2023
@lichunzhu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 68d54f5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 17, 2023
@ti-chi-bot ti-chi-bot merged commit e42601b into pingcap:release-6.5 Feb 17, 2023
@lichunzhu
Copy link
Contributor

/run-br-integration-test

@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Mar 13, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lichunzhu lichunzhu lichunzhu approved these changes

@sleepymole sleepymole sleepymole approved these changes

Assignees

@lichunzhu lichunzhu

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/lightning This issue is related to Lightning of TiDB. 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. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-chi-bot @lichunzhu @sleepymole @VelocityLight