Skip to content

sysvar: fix circular dependency in rebuildSysVarCache leading to deadlock (#40283)#40311

Merged
ti-chi-bot merged 1 commit intopingcap:release-6.5from
ti-chi-bot:cherry-pick-40283-to-release-6.5
Jan 4, 2023
Merged

sysvar: fix circular dependency in rebuildSysVarCache leading to deadlock (#40283)#40311
ti-chi-bot merged 1 commit intopingcap:release-6.5from
ti-chi-bot:cherry-pick-40283-to-release-6.5

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #40283

What problem does this PR solve?

Issue Number: close #40240

Problem Summary:

In #39584, we invoke SetGlobal of variable A in the Validation of variable B. This brought a circular dependency in rebuildSysVarCache. We must modify something to break this circular.

What is changed and how it works?

Modify the declaration of SetGlobalSysVarOnly, add a parameter to break the circular.

Check List

Tests

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

(cd executor ; go test -v -run 'TestValidateSetVar|TestIssue28073') | grep '^[^[]'

  • 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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

…lock

Add a parameter in NotifyUpdateSysVarCache to prevent circular dependency
@ti-chi-bot ti-chi-bot requested a review from a team as a code owner January 4, 2023 07:59
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 4, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • tangenta

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.

Details

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Jan 4, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 4, 2023
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 4, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 4, 2023
@tangenta
Copy link
Contributor

tangenta commented Jan 4, 2023

/merge

@ti-chi-bot
Copy link
Member Author

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

DetailsCommit hash: 7f2e314

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 4, 2023
@CbcWestwolf
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot merged commit 12f24d2 into pingcap:release-6.5 Jan 4, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Mar 13, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-40283-to-release-6.5 branch April 15, 2025 08:07
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-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants