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

mocktikv: fix data race in mocktikv split (#12414) #19711

Merged
merged 2 commits into from
Sep 3, 2020
Merged

mocktikv: fix data race in mocktikv split (#12414) #19711

merged 2 commits into from
Sep 3, 2020

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Sep 2, 2020 •
edited by zz-jason
Loading

cherry-pick #12414 to release-3.0

What problem does this PR solve?

fixes #12363

What is changed and how it works?

#12363 (comment)

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • change test

Side effects

  • n/a

Related changes

Release note

  • No release note

@lysu @ti-srebot
cherry pick pingcap#12414 to release-3.0
c1c7ca1 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Sep 2, 2020
Merged
@ti-srebot ti-srebot requested a review from crazycs520 September 2, 2020 07:55
@sre-bot
Copy link
Contributor

sre-bot commented Sep 2, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@Yisaer
Copy link
Contributor

Yisaer commented Sep 2, 2020

close #19443

crazycs520
crazycs520 approved these changes Sep 2, 2020
View reviewed changes
Copy link
Contributor

@crazycs520 crazycs520 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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 2, 2020
@zz-jason
Copy link
Member

zz-jason commented Sep 2, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 2, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@zz-jason
Copy link
Member

zz-jason commented Sep 3, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 19689

@sre-bot
Copy link
Contributor

sre-bot commented Sep 3, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lysu
Copy link
Contributor

lysu commented Sep 3, 2020

/rebuild

@sre-bot
Copy link
Contributor

sre-bot commented Sep 3, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@SunRunAway
Copy link
Contributor

/rebuild

@sre-bot
Copy link
Contributor

sre-bot commented Sep 3, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@SunRunAway
Copy link
Contributor

/rebuild

@sre-bot
Copy link
Contributor

sre-bot commented Sep 3, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

SunRunAway
SunRunAway approved these changes Sep 3, 2020
View reviewed changes
Copy link
Contributor

@SunRunAway SunRunAway 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-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Sep 3, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Sep 3, 2020
@zz-jason
Copy link
Member

zz-jason commented Sep 3, 2020

/run-check_release_note

@zz-jason zz-jason merged commit 85dc3b4 into pingcap:release-3.0 Sep 3, 2020
@SunRunAway SunRunAway deleted the release-3.0-ea6d508d9b43 branch September 3, 2020 05:50
@SunRunAway SunRunAway mentioned this pull request Sep 3, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crazycs520 crazycs520 crazycs520 approved these changes

@SunRunAway SunRunAway SunRunAway approved these changes

Assignees

@lysu lysu

Labels
component/test status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/3.0-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @sre-bot @Yisaer @zz-jason @lysu @SunRunAway @crazycs520