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

pessimistic-txn: support deadlock detector in mocktikv #10669

Merged
merged 3 commits into from Jun 3, 2019

Conversation

Projects
None yet
3 participants
@coocood
Copy link
Member

commented May 31, 2019

What problem does this PR solve?

Support deadlock detector in mocktikv for pessimistic transaction.

What is changed and how it works?

add 'util/deadlock' package and use it in mocktikv.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

@coocood coocood requested a review from tiancaiamao May 31, 2019

Show resolved Hide resolved session/pessimistic_test.go
Show resolved Hide resolved session/pessimistic_test.go
Show resolved Hide resolved session/pessimistic_test.go
Show resolved Hide resolved store/mockstore/mocktikv/mvcc_leveldb.go Outdated
}

// Expire removes entries with TS smaller than minTS.
func (d *Detector) Expire(minTS uint64) {

This comment has been minimized.

Copy link
@tiancaiamao

tiancaiamao May 31, 2019

Contributor

It's not actually used?

This comment has been minimized.

Copy link
@coocood

coocood May 31, 2019

Author Member

Will be used in the future.

@tiancaiamao

This comment has been minimized.

Copy link
Contributor

commented May 31, 2019

LGTM

@codecov

This comment has been minimized.

Copy link

commented May 31, 2019

Codecov Report

Merging #10669 into master will decrease coverage by 0.0542%.
The diff coverage is 100%.

@@               Coverage Diff                @@
##             master     #10669        +/-   ##
================================================
- Coverage   78.3187%   78.2645%   -0.0543%     
================================================
  Files           413        414         +1     
  Lines         87615      87608         -7     
================================================
- Hits          68619      68566        -53     
- Misses        13862      13916        +54     
+ Partials       5134       5126         -8
@jackysp

This comment has been minimized.

Copy link
Member

commented Jun 3, 2019

/run-all-tests

@jackysp

jackysp approved these changes Jun 3, 2019

Copy link
Member

left a comment

LGTM

@coocood coocood merged commit d71ce87 into pingcap:master Jun 3, 2019

6 checks passed

ci/circleci Your tests passed on CircleCI!
Details
idc-jenkins-ci-tidb/build Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/build_check_race Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/check_dev Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/check_dev_2 Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details

@coocood coocood deleted the coocood:deadlock branch Jun 3, 2019

coocood added a commit to coocood/tidb that referenced this pull request Jun 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.