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

core: fix datarace in MergeLabels (#7537) #7830

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #7537

What problem does this PR solve?

Issue Number: Close #7535

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 20, 2024
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Feb 20, 2024
Copy link
Contributor

ti-chi-bot bot commented Feb 20, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • rleungx

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 bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 20, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 20, 2024
@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 Feb 20, 2024
Copy link

codecov bot commented Feb 20, 2024

Codecov Report

Merging #7830 (94bab38) into release-7.5 (3488a65) will increase coverage by 0.02%.
Report is 1 commits behind head on release-7.5.
The diff coverage is 100.00%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-7.5    #7830      +/-   ##
===============================================
+ Coverage        74.53%   74.56%   +0.02%     
===============================================
  Files              444      444              
  Lines            48140    48154      +14     
===============================================
+ Hits             35882    35906      +24     
+ Misses            9073     9058      -15     
- Partials          3185     3190       +5     
Flag Coverage Δ
unittests 74.56% <100.00%> (+0.02%) ⬆️

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

@lhy1024
Copy link
Contributor

lhy1024 commented Feb 20, 2024

/merge

Copy link
Contributor

ti-chi-bot bot commented Feb 20, 2024

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

Copy link
Contributor

ti-chi-bot bot commented Feb 20, 2024

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

Commit hash: 94bab38

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 20, 2024
@ti-chi-bot ti-chi-bot bot merged commit d71a1a3 into tikv:release-7.5 Feb 20, 2024
24 checks passed
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/M Denotes a PR that changes 30-99 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-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants