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 data race on the SchemaOutOfDateRetryTimes/SchemaOutOfDateRetryInterval #31815

Merged
merged 4 commits into from
Jan 19, 2022
Merged

*: fix data race on the SchemaOutOfDateRetryTimes/SchemaOutOfDateRetryInterval #31815

merged 4 commits into from
Jan 19, 2022

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Jan 19, 2022 •
edited
Loading

Signed-off-by: Weizhen Wang [email protected]

What problem does this PR solve?

Issue Number: close #31812

Problem Summary:

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

ti-chi-bot commented Jan 19, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tangenta
  • zimulala

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 added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 19, 2022
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 19, 2022
@hawkingrei hawkingrei changed the title *: fix data race on the SchemaOutOfDateRetryTimes *: fix data race on the SchemaOutOfDateRetryTimes/SchemaOutOfDateRetryInterval Jan 19, 2022
zimulala
zimulala approved these changes Jan 19, 2022
View reviewed changes
Copy link
Contributor

@zimulala zimulala 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 the status/LGT1 Indicates that a PR has LGTM 1. label Jan 19, 2022
xhebox
xhebox reviewed Jan 19, 2022
View reviewed changes
session/session_test.go Outdated
Comment on lines 2168 to 2169
domain.SchemaOutOfDateRetryTimes.Store(10)
domain.SchemaOutOfDateRetryInterval.Store(500 * time.Millisecond)
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we should recover by originalRetryTime? I am not sure while the original code does not recover but assuming a default.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fix.

@hawkingrei
Copy link
Member Author

ref #31716

Atomic operations with the sync/atomic package operate on the raw types(int32, int64, etc.) so it is easy to forget to use the atomic operation to read or modify the variables.

@hawkingrei
set origin value for test
682d25f 
Signed-off-by: Weizhen Wang <[email protected]>
@hawkingrei
Copy link
Member Author

@xhebox PTAL

@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 19, 2022
@lcwangchao
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 682d25f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 19, 2022
@hawkingrei
Copy link
Member Author

/run-build

@hawkingrei
Copy link
Member Author

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Jan 19, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/9e92634ed0dff7808c13d63ce5f1e6b4f2343fdc

@ti-chi-bot ti-chi-bot merged commit 4fcbb2c into pingcap:master Jan 19, 2022
@hawkingrei hawkingrei deleted the fix_data_race_SchemaOutOfDateRetryTimes branch January 19, 2022 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox left review comments

@tangenta tangenta tangenta approved these changes

@zimulala zimulala zimulala approved these changes

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DATA RACE on the SchemaOutOfDateRetryTimes
7 participants
@hawkingrei @ti-chi-bot @lcwangchao @sre-bot @zimulala @xhebox @tangenta