Skip to content

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

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
Open
wants to merge 7 commits into
base: release-7.5
Choose a base branch
from
Open

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

wants to merge 7 commits into from

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
6096ecb 
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-7.5 This PR is cherry-picked to release-7.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 ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 24, 2025

This cherry pick PR is for a release branch and has not yet been approved by triage owners.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick:

  1. It must be approved by the approvers firstly.
  2. AFTER it has been approved by approvers, please wait for the cherry-pick merging approval from triage owners.

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 kubernetes-sigs/prow repository.

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

@okJiang
fix conflict
aa8371f 
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 Jul 7, 2025
@okJiang
fix confict
ca95cfe 
Signed-off-by: okjiang <819421878@qq.com>
@okJiang okJiang force-pushed the cherry-pick-9187-to-release-7.5 branch from 142f1c9 to ca95cfe Compare July 7, 2025 11:16
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 7, 2025 •
edited
Loading

@ti-chi-bot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci/build 6096ecb link true /test build

Full PR test history. Your PR dashboard.

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

okJiang added 4 commits July 7, 2025 19:20
@okJiang
Merge branch 'release-7.5' of https://github.com/tikv/pd into cherry-…
7bb3afb 
…pick-9187-to-release-7.5

Signed-off-by: okjiang <819421878@qq.com>
@okJiang
add opt
9efa146 
Signed-off-by: okjiang <819421878@qq.com>
@okJiang
Merge branch 'release-7.5' of https://github.com/tikv/pd into cherry-…
3ff9a75 
…pick-9187-to-release-7.5
@okJiang
revert some changes
6a2c54c 
Signed-off-by: okjiang <819421878@qq.com>
@okJiang
Copy link
Member

okJiang commented Jul 8, 2025

/retest

@ti-chi-bot ti-chi-bot bot added the lgtm label Jul 8, 2025
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JmPotato, 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 approved and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 8, 2025
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 8, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-07-07 11:03:18.303885507 +0000 UTC m=+1911251.027064483: ☑️ agreed by okJiang.
  • 2025-07-08 07:06:10.125532987 +0000 UTC m=+1983422.848711969: ☑️ agreed by JmPotato.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JmPotato JmPotato JmPotato 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 dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/cherry-pick-not-approved do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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-7.5 This PR is cherry-picked to release-7.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 @okJiang @JmPotato