Skip to content

fix data race of LocalAdmissionController#10332

Merged
ti-chi-bot[bot] merged 4 commits intopingcap:masterfrom
guo-shaoge:refine_lac_1
Aug 11, 2025
Merged

fix data race of LocalAdmissionController#10332
ti-chi-bot[bot] merged 4 commits intopingcap:masterfrom
guo-shaoge:refine_lac_1

Conversation

@guo-shaoge
Copy link
Contributor

@guo-shaoge guo-shaoge commented Aug 6, 2025 •
edited
Loading

What problem does this PR solve?

Issue Number: close #10331

Problem Summary:

What is changed and how it works?

  1. fix data race of keyspace_resource_groups
  2. refine the logic of handling current_tick/cur_tick_end.
  3. add endRequest when got error in the logic of handling GAC resp. Otherwise this rg will enter degrade mode, and it will not acquire any tokens from GAC for DEGRADE_MODE_DURATION seconds (120s)

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

fix data race of LocalAdmissionController

@guo-shaoge
refine lac
f81fe55 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix
0c9bd9a 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Aug 6, 2025
@guo-shaoge
fix
14c36f9 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge guo-shaoge requested a review from JaySon-Huang August 6, 2025 08:21
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Aug 6, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 11, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: solotzg, wshwsh12

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

The pull request process is described here

Details 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 and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 11, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 11, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-08-06 08:40:01.399505848 +0000 UTC m=+430311.542267033: ☑️ agreed by solotzg.
  • 2025-08-11 02:22:49.606217557 +0000 UTC m=+234168.640800775: ☑️ agreed by wshwsh12.

@ti-chi-bot ti-chi-bot bot merged commit dce9588 into pingcap:master Aug 11, 2025
7 checks passed
@guo-shaoge guo-shaoge deleted the refine_lac_1 branch August 11, 2025 06:28
@guo-shaoge
Copy link
Contributor Author

guo-shaoge commented Aug 12, 2025

/run-cherry-picker

@guo-shaoge guo-shaoge added needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. labels Aug 13, 2025
@guo-shaoge
Copy link
Contributor Author

guo-shaoge commented Aug 13, 2025

/run-cherry-picker

ti-chi-bot pushed a commit to ti-chi-bot/tiflash that referenced this pull request Aug 13, 2025
@guo-shaoge @ti-chi-bot
This is an automated cherry-pick of pingcap#10332
66a307d 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 13, 2025

In response to a cherrypick label: new pull request created to branch release-8.1: #10342.
But this PR has conflicts, please resolve them!

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 13, 2025
Open
12 tasks
ti-chi-bot pushed a commit to ti-chi-bot/tiflash that referenced this pull request Aug 13, 2025
@guo-shaoge @ti-chi-bot
This is an automated cherry-pick of pingcap#10332
769d744 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 13, 2025

In response to a cherrypick label: new pull request created to branch release-7.5: #10343.
But this PR has conflicts, please resolve them!

ti-chi-bot pushed a commit to ti-chi-bot/tiflash that referenced this pull request Aug 13, 2025
@guo-shaoge @ti-chi-bot
This is an automated cherry-pick of pingcap#10332
0a0e746 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 13, 2025
Open
12 tasks
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 13, 2025

In response to a cherrypick label: new pull request created to branch release-8.5: #10344.
But this PR has conflicts, please resolve them!

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 13, 2025
Merged
12 tasks
ti-chi-bot bot pushed a commit that referenced this pull request Aug 29, 2025
@ti-chi-bot @guo-shaoge
fix data race of LocalAdmissionController (#10332) (#10344)
b962717 
close #10331

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: guo-shaoge <shaoge1994@163.com>

Co-authored-by: guo-shaoge <shaoge1994@163.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@solotzg solotzg solotzg approved these changes

@wshwsh12 wshwsh12 wshwsh12 approved these changes

@JaySon-Huang JaySon-Huang Awaiting requested review from JaySon-Huang

Assignees

No one assigned

Labels

approved lgtm needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

LAC may have data race

4 participants

@guo-shaoge @ti-chi-bot @solotzg @wshwsh12