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

session,store/tikv: make CI more stable #13303

Merged
merged 2 commits into from
Nov 9, 2019

Conversation

tiancaiamao
Copy link
Contributor

@tiancaiamao tiancaiamao commented Nov 8, 2019

What problem does this PR solve?

make TestBatchResolveLocks more stable
make TestErrorRollback faster

Fix #13281

What is changed and how it works?

After #13123, TestErrorRollback runs slower than before in the race test.

Increase TTL for TestBatchResolveLocks to make it more stable.

Check List

Tests

  • Unit test

make TestBatchResolveLocks more stable
make TestErrorRollback faster
@tiancaiamao
Copy link
Contributor Author

PTAL @SunRunAway

@codecov
Copy link

codecov bot commented Nov 8, 2019

Codecov Report

Merging #13303 into master will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master     #13303   +/-   ##
===========================================
  Coverage   80.1529%   80.1529%           
===========================================
  Files           469        469           
  Lines        112042     112042           
===========================================
  Hits          89805      89805           
  Misses        15291      15291           
  Partials       6946       6946

@@ -151,7 +151,7 @@ func (s *testSessionSuite) TestErrorRollback(c *C) {
var wg sync.WaitGroup
cnt := 4
wg.Add(cnt)
num := 100
num := 20
Copy link
Member

Choose a reason for hiding this comment

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

Is it OK to decrease the tested number?

Would you please give some explains why this test become slower since the related PR is merged

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is it OK to decrease the tested number?

I guess so, at lease the change doesn't affect the correctness.

The ResolveLocks function is more sensitivity than before, in a heavy write conflict sense the contention increase.

@zz-jason
Copy link
Member

zz-jason commented Nov 9, 2019

LGTM

@sykp241095 sykp241095 added the status/can-merge Indicates a PR has been approved by a committer. label Nov 9, 2019
Copy link
Contributor

@SunRunAway SunRunAway left a comment

Choose a reason for hiding this comment

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

LGTM

@sre-bot
Copy link
Contributor

sre-bot commented Nov 9, 2019

/run-all-tests

1 similar comment
@sykp241095
Copy link
Member

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Nov 9, 2019

@tiancaiamao merge failed.

@sykp241095
Copy link
Member

/run-unit-test

@sykp241095 sykp241095 merged commit 3712664 into pingcap:master Nov 9, 2019
@tiancaiamao tiancaiamao deleted the ci-stable branch November 9, 2019 09:11
XiaTianliang pushed a commit to XiaTianliang/tidb that referenced this pull request Dec 21, 2019
make TestBatchResolveLocks more stable
make TestErrorRollback faster
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

unit test fails in TestBatchResolveLocks
6 participants