Skip to content

store: update StoreInfo inside putStoreLocked (#9187) #9251

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
Merged
merged 3 commits into from
Apr 25, 2025
Merged

store: update StoreInfo inside putStoreLocked (#9187) #9251

merged 3 commits into from
Apr 25, 2025

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #9187

What problem does this PR solve?

Issue Number: Close #9185

What is changed and how does it work?

store: update StoreInfo inside putStoreLocked

Check List

Tests

  • Unit test
  • Integration test

Release note

Fix the bug that StoreInfo may have erroneous overrides.

@okJiang @ti-chi-bot
This is an automated cherry-pick of tikv#9187
5b25baa 
close tikv#9185

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Apr 24, 2025
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 24, 2025
Merged
@ti-chi-bot
Copy link
Member Author

@okJiang This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 24, 2025
@okJiang
fix conflict
fc1068b 
Signed-off-by: okJiang <819421878@qq.com>
@codecov Codecov
Copy link

codecov bot commented Apr 25, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 95.74468% with 2 lines in your changes missing coverage. Please review.

Project coverage is 75.55%. Comparing base (064ddd6) to head (f78ce81).
Report is 1 commits behind head on release-8.5.

Additional details and impacted files 
@@               Coverage Diff               @@
##           release-8.5    #9251      +/-   ##
===============================================
+ Coverage        75.49%   75.55%   +0.05%     
===============================================
  Files              462      462              
  Lines            72415    72412       -3     
===============================================
+ Hits             54671    54709      +38     
+ Misses           14225    14192      -33     
+ Partials          3519     3511       -8
Flag Coverage Δ
unittests 75.55% <95.74%> (+0.05%) ⬆️

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@okJiang
move code
f78ce81 
Signed-off-by: okJiang <819421878@qq.com>
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Apr 25, 2025
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lhy1024, okJiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm approved and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Apr 25, 2025
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 25, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-04-25 05:08:32.406728977 +0000 UTC m=+591456.218519351: ☑️ agreed by okJiang.
  • 2025-04-25 05:36:00.96378313 +0000 UTC m=+593104.775573511: ☑️ agreed by lhy1024.

@lhy1024 lhy1024 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 25, 2025
@ti-chi-bot ti-chi-bot bot merged commit 8894529 into tikv:release-8.5 Apr 25, 2025
22 checks passed
@okJiang okJiang deleted the cherry-pick-9187-to-release-8.5 branch July 10, 2025 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

+1 more reviewer

@okJiang okJiang okJiang approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@okJiang okJiang

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @lhy1024 @okJiang