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.

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

leadership: avoid potential data race (#6636) #6703

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6636

What problem does this PR solve?

Issue Number: Close #6635

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 28, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HuSharp
  • bufferflies

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. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR. labels Jun 28, 2023
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. labels Jun 28, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 28, 2023
@ti-chi-bot ti-chi-bot bot requested review from lhy1024 and rleungx June 28, 2023 03:47
lhy1024 and others added 2 commits June 28, 2023 11:59
Signed-off-by: lhy1024 <[email protected]>
close tikv#5434

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ti Chi Robot <[email protected]>
Signed-off-by: lhy1024 <[email protected]>
@codecov
Copy link

codecov bot commented Jun 28, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.10 ⚠️

Comparison is base (cb1af02) 74.88% compared to head (f415707) 74.78%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-5.4    #6703      +/-   ##
===============================================
- Coverage        74.88%   74.78%   -0.10%     
===============================================
  Files              265      265              
  Lines            28008    28012       +4     
===============================================
- Hits             20974    20950      -24     
- Misses            5187     5211      +24     
- Partials          1847     1851       +4     
Flag Coverage Δ
unittests 74.78% <100.00%> (-0.10%) ⬇️

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

Impacted Files Coverage Δ
server/election/leadership.go 78.21% <100.00%> (+0.89%) ⬆️
server/server.go 71.68% <100.00%> (-1.20%) ⬇️

... and 11 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 29, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 29, 2023
@lhy1024
Copy link
Contributor

lhy1024 commented Jun 29, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 29, 2023

@lhy1024: 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.

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
Contributor

ti-chi-bot bot commented Jun 29, 2023

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

Commit hash: f415707

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 29, 2023
@ti-chi-bot ti-chi-bot bot merged commit 1198030 into tikv:release-5.4 Jun 29, 2023
@HuSharp HuSharp deleted the cherry-pick-6636-to-release-5.4 branch June 29, 2023 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. 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-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants