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.

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

fix potential data race when report resource group metric #8235

Merged
merged 7 commits into from
Oct 25, 2023
Merged

fix potential data race when report resource group metric #8235

merged 7 commits into from
Oct 25, 2023

Conversation

guo-shaoge
Copy link
Contributor

@guo-shaoge guo-shaoge commented Oct 23, 2023 •
edited

What problem does this PR solve?

Issue Number: close #8233

Problem Summary: Different MPPTask can report resource group metric at the same time, which may cause data race of adding metric

What is changed and how it works?

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

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 23, 2023
@guo-shaoge guo-shaoge changed the title [WIP] Fix data race fix potential data race when report resource group metric Oct 25, 2023
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 25, 2023
@guo-shaoge
Copy link
Contributor Author

/run-all-tests

SeaRise
SeaRise approved these changes Oct 25, 2023
View reviewed changes
Copy link
Contributor

@SeaRise SeaRise left a comment

Choose a reason for hiding this comment

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

Others LGTM

dbms/src/Common/TiFlashMetrics.h Outdated
Comment on lines 903 to 904
std::shared_mutex mu;
std::unordered_map<String, std::vector<T *>> metrics_map;
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe change it to a better name?
Maybe resource_group_metrics_map and resource_group_metrics_mu

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

windtalker
windtalker approved these changes Oct 25, 2023
View reviewed changes
Copy link
Contributor

@windtalker windtalker 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
Copy link
Contributor

ti-chi-bot bot commented Oct 25, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SeaRise, windtalker

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
Copy link
Contributor

ti-chi-bot bot commented Oct 25, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-10-25 03:18:05.402090106 +0000 UTC m=+2404682.989200251: ☑️ agreed by SeaRise.
  • 2023-10-25 05:01:43.735587254 +0000 UTC m=+2410901.322697398: ☑️ agreed by windtalker.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 25, 2023

@guo-shaoge: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

trigger some heavy tests which will not run always when PR updated.

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.

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.

@ti-chi-bot ti-chi-bot bot merged commit 57c0c57 into pingcap:master Oct 25, 2023
6 checks passed
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Oct 25, 2023
Merged
12 tasks
@guo-shaoge guo-shaoge deleted the fix_data_race branch October 25, 2023 10:12
ti-chi-bot bot pushed a commit that referenced this pull request Oct 26, 2023
@ti-chi-bot
fix potential data race when report resource group metric (#8235) (#8243
b629271 
)

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

@JaySon-Huang JaySon-Huang JaySon-Huang left review comments

@windtalker windtalker windtalker approved these changes

@SeaRise SeaRise SeaRise approved these changes

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-7.5 release-note-none size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MPPTaskScheduleEntry::waitForSchedule null pointer caused tiflash crash
5 participants
@guo-shaoge @ti-chi-bot @windtalker @JaySon-Huang @SeaRise