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

failpoint: update failpoint (#17628) #17710

Merged
merged 10 commits into from
Jun 28, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jun 5, 2020

cherry-pick #17628 to release-3.0


Signed-off-by: AilinKid 314806019@qq.com

What problem does this PR solve?

Related failpoint PR: pingcap/failpoint#58

Problem Summary:

Fix go failpoint data race in TiDB test case.
1: when *CustomParallelSuiteFlag = true is set, the tests in different Suite will run parallelly.
2: when a test arrived Enable(), when another arrived Eval() will cause data race in failpoint.

For more detail:
1: see https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/tidb_ghpr_unit_test/detail/tidb_ghpr_unit_test/38125/pipeline/
2: Also fixes #17625

What is changed and how it works?

What's Changed: update go.mod

Check List

Tests

  • No code

Release note

  • failpoint: update failpoint which will cause data race before

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

/run-all-tests

@sre-bot sre-bot added component/test type/3.0-cherry-pick type/bugfix This PR fixes a bug. type/enhancement The issue or PR belongs to an enhancement. labels Jun 5, 2020
@sre-bot sre-bot added this to the v3.0.15 milestone Jun 5, 2020
@bb7133 bb7133 modified the milestones: v3.0.15, 3.0.16, v3.0.16 Jun 6, 2020
go.mod Outdated
@@ -31,6 +31,7 @@ require (
github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7
github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef
github.com/opentracing/basictracer-go v1.0.0
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@AilinKid
Please fix the conflict.

Copy link
Contributor

Choose a reason for hiding this comment

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

addressed

Signed-off-by: AilinKid <314806019@qq.com>
@AilinKid
Copy link
Contributor

AilinKid commented Jun 8, 2020

@zimulala @djshow832 PTAL

@AilinKid
Copy link
Contributor

AilinKid commented Jun 8, 2020

/run-all-tests

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

Copy link
Member

@wjhuang2016 wjhuang2016 left a comment

Choose a reason for hiding this comment

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

LGTM

@AilinKid
Copy link
Contributor

AilinKid commented Jun 9, 2020

/run-all-tests

@zimulala zimulala added the status/can-merge Indicates a PR has been approved by a committer. label Jun 9, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 9, 2020

Sorry @zimulala, you don't have permission to trigger auto merge event on this branch.

@zimulala
Copy link
Contributor

zimulala commented Jun 9, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 9, 2020

Sorry @zimulala, you don't have permission to trigger auto merge event on this branch.

@AilinKid
Copy link
Contributor

AilinKid commented Jun 9, 2020

/run-sqllogic-test-1

@AilinKid
Copy link
Contributor

@bb7133 PTAL

@qw4990 qw4990 added the status/LGT2 Indicates that a PR has LGTM 2. label Jun 28, 2020
@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 17308
  • 17496
  • 17499
  • 17583

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@sre-bot merge failed.

@qw4990
Copy link
Contributor

qw4990 commented Jun 28, 2020

/run-all-tests

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 17935
  • 17715

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 3d8823f into pingcap:release-3.0 Jun 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/test status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/enhancement The issue or PR belongs to an enhancement. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants