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

operator: make additional information thread safe #8104

Merged
merged 1 commit into from
Apr 19, 2024

Conversation

HuSharp
Copy link
Member

@HuSharp HuSharp commented Apr 19, 2024

What problem does this PR solve?

Issue Number: Close #8079

What is changed and how does it work?

before #8032 merged(affected 8.1.0), controller has a lock https://github.com/tikv/pd/pull/8032/files#diff-0962f2eb6ba371d4f7abb601fdd9391aec93e770f1b75cad36045f86dea9b7d2L57

when cancel the operator, will hold this lock to avoid data race.

  • We need to make sure the additional information field is safe
  • other fields only be set when createOperator

panic get from the array while inserting elements in this array

img_v3_02a3_b2b8d818-c7b9-4bcf-af88-c73288b67c1g

image

Check List

Tests

  • Unit test

Release note

None.

Signed-off-by: husharp <[email protected]>
Copy link
Contributor

ti-chi-bot bot commented Apr 19, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lhy1024
  • nolouch

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/needs-triage-completed labels Apr 19, 2024
@HuSharp HuSharp requested a review from JmPotato April 19, 2024 10:53
Copy link

codecov bot commented Apr 19, 2024

Codecov Report

Merging #8104 (6a9906b) into master (882d2e5) will increase coverage by 0.01%.
Report is 2 commits behind head on master.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8104      +/-   ##
==========================================
+ Coverage   77.28%   77.30%   +0.01%     
==========================================
  Files         470      470              
  Lines       61129    61143      +14     
==========================================
+ Hits        47244    47264      +20     
+ Misses      10310    10309       -1     
+ Partials     3575     3570       -5     
Flag Coverage Δ
unittests 77.30% <100.00%> (+0.01%) ⬆️

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

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 19, 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 Apr 19, 2024
@nolouch
Copy link
Contributor

nolouch commented Apr 19, 2024

/merge

Copy link
Contributor

ti-chi-bot bot commented Apr 19, 2024

@nolouch: 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 Apr 19, 2024

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

Commit hash: 6a9906b

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 19, 2024
@ti-chi-bot ti-chi-bot bot merged commit 4a7bffc into tikv:master Apr 19, 2024
27 checks passed
@HuSharp HuSharp deleted the make_operator_safe branch April 19, 2024 11:28
@nolouch nolouch added the needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. label Apr 22, 2024
@nolouch
Copy link
Contributor

nolouch commented Apr 22, 2024

/run-cherry-picker

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #8111.

ti-chi-bot bot pushed a commit that referenced this pull request Apr 22, 2024
nolouch pushed a commit to nolouch/pd that referenced this pull request Apr 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PD panic at (*Operator).GetAdditionalInfo
4 participants