Skip to content

Fix deadlock happen in mvcc.#3911

Merged
ti-chi-bot merged 5 commits intopingcap:masterfrom
jiaqizho:fix-deadlock-in-apply
Jan 20, 2022
Merged

Fix deadlock happen in mvcc.#3911
ti-chi-bot merged 5 commits intopingcap:masterfrom
jiaqizho:fix-deadlock-in-apply

Conversation

@jiaqizho
Copy link
Contributor

@jiaqizho jiaqizho commented Jan 20, 2022

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary:

  • when mvcc apply a writebatch within a ref and del
  • and the origin_id in ref same as del(or put)
  • then apply method will get the lock first. and in ref op, will get a lock again.

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

None

@jiaqizho jiaqizho requested a review from JaySon-Huang January 20, 2022 08:02
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JaySon-Huang

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.

Details

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-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 20, 2022
JaySon-Huang
JaySon-Huang approved these changes Jan 20, 2022
View reviewed changes
Copy link
Contributor

@JaySon-Huang JaySon-Huang left a comment

Choose a reason for hiding this comment

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

LGTM with small comments

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 20, 2022
jiaqizho and others added 2 commits January 20, 2022 16:54
@jiaqizho @JaySon-Huang
Update dbms/src/Storages/Page/V3/PageDirectory.cpp
0b18dfb 
Co-authored-by: JaySon <jayson.hjs@gmail.com>
@jiaqizho @JaySon-Huang
Update dbms/src/Storages/Page/V3/PageDirectory.cpp
f52c9a6 
Co-authored-by: JaySon <jayson.hjs@gmail.com>
@jiaqizho
Copy link
Contributor Author

jiaqizho commented Jan 20, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 20, 2022

@jiaqizho: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

Details

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.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 20, 2022

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

DetailsCommit hash: f52c9a6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 20, 2022
@JaySon-Huang
Copy link
Contributor

JaySon-Huang commented Jan 20, 2022

/run-unit-test

@sre-bot
Copy link
Collaborator

sre-bot commented Jan 20, 2022

Coverage detail: https://ci-internal.pingcap.net/job/tics_ghpr_unit_test/1089/cobertura/
(Coverage detail url is limited office network access)

lines: 44.7% (51528 out of 115216)
branches: 7.0% (89838 out of 1275311)

@ti-chi-bot ti-chi-bot merged commit 10c2bd1 into pingcap:master Jan 20, 2022
@JaySon-Huang JaySon-Huang deleted the fix-deadlock-in-apply branch January 20, 2022 09:56
@JaySon-Huang JaySon-Huang mentioned this pull request Jan 20, 2022
Closed
76 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JaySon-Huang JaySon-Huang JaySon-Huang approved these changes

Assignees

No one assigned

Labels

release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jiaqizho @ti-chi-bot @JaySon-Huang @sre-bot