Skip to content

Fix test_delegate_subscribe_unsubscribe flaking test (#12309)#12315

Merged
ti-chi-bot merged 3 commits intotikv:release-6.0from
ti-srebot:release-6.0-fd2bdd2a5fb2
Apr 11, 2022
Merged

Fix test_delegate_subscribe_unsubscribe flaking test (#12309)#12315
ti-chi-bot merged 3 commits intotikv:release-6.0from
ti-srebot:release-6.0-fd2bdd2a5fb2

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 31, 2022 •
edited
Loading

cherry-pick #12309 to release-6.0
You can switch your code base to this Pull Request by using git-extras:

# In tikv repo:
git pr https://github.com/tikv/tikv/pull/12315

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tikv.git pr/12315:release-6.0-fd2bdd2a5fb2

What is changed and how it works?

Issue Number: Close #12278

What's Changed:

Fix test_delegate_subscribe_unsubscribe flaking test. 
Use the corresponding id, otherwise there will be failures due to concurrent runs of the test. (We will assign downstream ids concurrently).

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

None

Release note 

None

@0xPoe @ti-srebot
cherry pick tikv#12309 to release-6.0
f026a8a 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hicqu
  • overvenus

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.

Details

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

@ti-srebot
Copy link
Contributor Author

ti-srebot commented Mar 31, 2022

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 31, 2022
@ti-srebot ti-srebot mentioned this pull request Mar 31, 2022
Merged
@ti-srebot ti-srebot added component/CDC Component: Change Data Capture size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick Type: PR - Cherry pick labels Mar 31, 2022
@ti-srebot ti-srebot requested review from hicqu and overvenus March 31, 2022 09:13
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Mar 31, 2022

@hi-rustin you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 31, 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 Mar 31, 2022
@hicqu
Copy link
Contributor

hicqu commented Apr 1, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 1, 2022

@hicqu: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 1, 2022

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

DetailsCommit hash: f026a8a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 6, 2022

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@0xPoe
Copy link
Member

0xPoe commented Apr 8, 2022

/test

@0xPoe
Copy link
Member

0xPoe commented Apr 8, 2022

/run-test

@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 11, 2022
@0xPoe
Copy link
Member

0xPoe commented Apr 11, 2022

/run-test

@hicqu
Copy link
Contributor

hicqu commented Apr 11, 2022

/test

1 similar comment
@hicqu
Copy link
Contributor

hicqu commented Apr 11, 2022

/test

@0xPoe
Copy link
Member

0xPoe commented Apr 11, 2022

/run-test

@ti-chi-bot ti-chi-bot merged commit 4dd5a13 into tikv:release-6.0 Apr 11, 2022
@hicqu hicqu deleted the release-6.0-fd2bdd2a5fb2 branch April 12, 2022 06:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@overvenus overvenus overvenus approved these changes

@hicqu hicqu hicqu approved these changes

Assignees

@0xPoe 0xPoe

Labels

cherry-pick-approved Cherry pick PR approved by release team. component/CDC Component: Change Data Capture 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. type/cherry-pick Type: PR - Cherry pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ti-srebot @ti-chi-bot @hicqu @0xPoe @overvenus @VelocityLight