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 races in from MockTiFlash #31836

Merged
merged 14 commits into from
Jan 25, 2022
Merged

*: fix data races in from MockTiFlash #31836

merged 14 commits into from
Jan 25, 2022

Conversation

CalvinNeo
Copy link
Member

What problem does this PR solve?

Issue Number: close #31830

Problem Summary:

Some fields in MockTiFlash is tested to have data race.

What is changed and how it works?

Add lock for MockTiFlash.

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 races in from MockTiFlash

@CalvinNeo
fix1
cc32eb7 
Signed-off-by: CalvinNeo <[email protected]>
@CalvinNeo
fix
076f5c4 
Signed-off-by: CalvinNeo <[email protected]>
@CalvinNeo
move
19cb3c6 
Signed-off-by: CalvinNeo <[email protected]>
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • xhebox

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 Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 20, 2022
@CalvinNeo
fix fmt
0b4f5c9 
Signed-off-by: CalvinNeo <[email protected]>
hawkingrei
hawkingrei reviewed Jan 20, 2022
View reviewed changes
ddl/ddl_tiflash_test.go Outdated
@@ -60,6 +60,8 @@ const (
func (s *tiflashDDLTestSuite) SetUpSuite(c *C) {
Copy link
Member

Choose a reason for hiding this comment

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

You need migrate those new test case to new test framework.

Copy link
Member

Choose a reason for hiding this comment

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

ref #26022

Copy link
Member Author

Choose a reason for hiding this comment

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

#31946 will do that

@CalvinNeo
fix
6643f7e 
Signed-off-by: CalvinNeo <[email protected]>
@sre-bot
Copy link
Contributor

sre-bot commented Jan 20, 2022 •
edited
Loading

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

xhebox
xhebox reviewed Jan 20, 2022
View reviewed changes
Copy link
Contributor

@xhebox xhebox left a comment

Choose a reason for hiding this comment

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

I think it actually depends on #31832, wait for the merge of that first.

xhebox
xhebox requested changes Jan 25, 2022
View reviewed changes
Copy link
Contributor

@xhebox xhebox left a comment

Choose a reason for hiding this comment

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

Resolve the conflicts first

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 25, 2022
@CalvinNeo CalvinNeo requested a review from xhebox January 25, 2022 05:29
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 25, 2022
@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 25, 2022
@CalvinNeo
fix
08e6e95 
Signed-off-by: CalvinNeo <[email protected]>
@CalvinNeo
Copy link
Member Author

/run-unit-test

@hawkingrei
Copy link
Member

/run-mysql-test

@xhebox
Copy link
Contributor

xhebox commented Jan 25, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 08e6e95

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

/run-check_dev_2

@CalvinNeo
Copy link
Member Author

/run-unit-test

1 similar comment
@CalvinNeo
Copy link
Member Author

/run-unit-test

@ti-chi-bot
Copy link
Member

@CalvinNeo: 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

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.

@hawkingrei
Copy link
Member

/run-mysql-test

@CalvinNeo
Copy link
Member Author

/run-unit-test

@CalvinNeo
Copy link
Member Author

/run-check_dev_2

@CalvinNeo
Copy link
Member Author

/run-tics-test

@ti-chi-bot ti-chi-bot merged commit 3c797fd into pingcap:master Jan 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hawkingrei hawkingrei hawkingrei approved these changes

@xhebox xhebox xhebox approved these changes

Assignees
No one assigned
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DATA RACE in the MockTiFlash.SyncStatus
5 participants
@CalvinNeo @ti-chi-bot @sre-bot @hawkingrei @xhebox