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

*: replace unified sorter dir conflict test with unit tests #2528

Merged
merged 4 commits into from
Aug 16, 2021
Merged

*: replace unified sorter dir conflict test with unit tests #2528

merged 4 commits into from
Aug 16, 2021

Conversation

overvenus
Copy link
Member

What problem does this PR solve?

Replace unified sorter dir conflict test into unit tests

Close https://github.com/pingcap/ticdc/issues/2348

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note 

None

@overvenus overvenus added component/test Unit tests and integration tests component. needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. component/sorter Sorter component. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. labels Aug 13, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 13, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • hi-rustin

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 the release-note-none Denotes a PR that doesn't merit a release note. label Aug 13, 2021
@ti-chi-bot ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 13, 2021
@overvenus overvenus changed the title *: replace unified sorter dir conflict test into unit tests *: replace unified sorter dir conflict test with unit tests Aug 13, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 16, 2021
@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 Aug 16, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 649bea6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 16, 2021
@overvenus
Copy link
Member Author

/run-kafka-tests
/run-integration-tests

@overvenus
Copy link
Member Author

/run-unit-tests

@overvenus
Copy link
Member Author

/run-all-tests

@overvenus
Copy link
Member Author

/run-tests
/run-integration-tests

@purelind
Copy link
Collaborator

/run-integration-common-test

@amyangfei
Copy link
Contributor

/run-unit-tests
/run-integration-tests

1 similar comment
@Rustin170506
Copy link
Member

/run-unit-tests
/run-integration-tests

@ti-chi-bot ti-chi-bot merged commit a49fe01 into pingcap:master Aug 16, 2021
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 16, 2021
@overvenus @ti-chi-bot
This is an automated cherry-pick of pingcap#2528
b063560 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 16, 2021
Merged
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 16, 2021
@overvenus @ti-chi-bot
This is an automated cherry-pick of pingcap#2528
566e68a 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 16, 2021
Merged
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 16, 2021
Merged
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 16, 2021
Merged
@ti-chi-bot
Copy link
Member

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

@nongfushanquan nongfushanquan added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 19, 2021
ti-chi-bot added a commit that referenced this pull request Aug 19, 2021
@ti-chi-bot
*: replace unified sorter dir conflict test with unit tests (#2528) (#…
7e75649 
…2544)
ti-chi-bot added a commit that referenced this pull request Aug 19, 2021
@ti-chi-bot
*: replace unified sorter dir conflict test with unit tests (#2528) (#…
8c10013 
…2545)
ti-chi-bot added a commit that referenced this pull request Aug 19, 2021
@ti-chi-bot
*: replace unified sorter dir conflict test with unit tests (#2528) (#…
5ee72bb 
…2546)
ti-chi-bot added a commit that referenced this pull request Aug 19, 2021
@ti-chi-bot
*: replace unified sorter dir conflict test with unit tests (#2528) (#…
87c7cc3 
…2547)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei approved these changes

@Rustin170506 Rustin170506 Rustin170506 approved these changes

@liuzix liuzix Awaiting requested review from liuzix

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/sorter Sorter component. component/test Unit tests and integration tests component. needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. release-note-none Denotes a PR that doesn't merit a release note. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

integration test unified_sorter_sort_dir_conflict is not stable
6 participants
@overvenus @ti-chi-bot @amyangfei @purelind @Rustin170506 @nongfushanquan