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 some other tests from TiFlash Cluster Manager #31832

Merged
merged 13 commits into from
Jan 24, 2022
Merged

*: fix data races in some other tests from TiFlash Cluster Manager #31832

merged 13 commits into from
Jan 24, 2022

Conversation

CalvinNeo
Copy link
Member

@CalvinNeo CalvinNeo commented Jan 19, 2022 •
edited
Loading

Signed-off-by: CalvinNeo [email protected]

What problem does this PR solve?

Issue Number: close #31828 close #31829

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

fix data races in some other tests from TiFlash Cluster Manager

@CalvinNeo
fix1
cc32eb7 
Signed-off-by: CalvinNeo <[email protected]>
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lcwangchao
  • 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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 19, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jan 19, 2022 •
edited
Loading

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

@CalvinNeo CalvinNeo marked this pull request as ready for review January 19, 2022 16:07
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 19, 2022
tangenta
tangenta reviewed Jan 20, 2022
View reviewed changes
ddl/ddl_tiflash_test.go Outdated
Comment on lines 94 to 95
ddl.PollTiFlashInterval.Store(1000 * time.Millisecond)
ddl.PullTiFlashPdTick.Store(60)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think moving these initializations to the beginning of SetUpSuite should solve data race(because the DDL is not started). Then we don't need to use atomic.

Copy link
Member Author

Choose a reason for hiding this comment

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

I can move them to the beginning. However, these values will be modified in test cases which I think is in a goroutine other than DDL. I think it may also lead to some data race?

zimulala
zimulala reviewed Jan 20, 2022
View reviewed changes
ddl/ddl_tiflash_test.go Outdated
@@ -60,6 +60,8 @@ const (
func (s *tiflashDDLTestSuite) SetUpSuite(c *C) {
var err error

ddl.PollTiFlashInterval.Store(1000 * 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.

PollTiFlashInterval is now only set here and TearDownSuite, could you remove the atomic way?

zimulala
zimulala reviewed Jan 20, 2022
View reviewed changes
ddl/ddl_tiflash_test.go Outdated
@@ -60,6 +60,8 @@ const (
func (s *tiflashDDLTestSuite) SetUpSuite(c *C) {
var err error

ddl.PollTiFlashInterval.Store(1000 * 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.

PollTiFlashInterval is now only set here and TearDownSuite, could you remove the atomic way?

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 20, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 20, 2022
@CalvinNeo
Copy link
Member Author

/run-unit-test

@CalvinNeo
Copy link
Member Author

/run-mysql-test

@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 24, 2022
@xhebox
Copy link
Contributor

xhebox commented Jan 24, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 79e851f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 24, 2022
@ti-chi-bot ti-chi-bot merged commit 2d6386d into pingcap:master Jan 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimulala zimulala zimulala left review comments

@tangenta tangenta tangenta left review comments

@lcwangchao lcwangchao lcwangchao 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/S Denotes a PR that changes 10-29 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 at the PullTiFlashPdTick DATA RACE in the tiflashDDLTestSuite
7 participants
@CalvinNeo @ti-chi-bot @sre-bot @xhebox @lcwangchao @zimulala @tangenta