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

server: fix deadlock when call killNonFlashbackConn #38872

Merged
merged 4 commits into from Nov 3, 2022

Conversation

Defined2014
Copy link
Contributor

@Defined2014 Defined2014 commented Nov 3, 2022

What problem does this PR solve?

Issue Number: close #38862

Problem Summary:

  1. update client-go to fix minSafeTS not change for about 10 minutes tikv/tikv#13675
  2. fix deadlock for killNonFlashbackConn, it require the read lock at
    s.rwlock.RLock()
    , then try to get read lock in s.Kill() func, if another write lock require in between, like close/create conn, it will deadlock forever.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
use tpcc workload, then execute flashback, no deadlock anymore.
  • 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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 3, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • dveeden
  • hawkingrei

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 release-note-none size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 3, 2022
server/server.go Outdated Show resolved Hide resolved
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.

Rest LGTM

@Defined2014 Defined2014 added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 3, 2022
@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Nov 3, 2022
@Defined2014 Defined2014 added the status/can-merge Indicates a PR has been approved by a committer. label Nov 3, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Nov 3, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 3, 2022
@Defined2014 Defined2014 added the status/LGT2 Indicates that a PR has LGTM 2. label Nov 3, 2022
@ti-chi-bot ti-chi-bot removed the status/LGT2 Indicates that a PR has LGTM 2. label Nov 3, 2022
@Defined2014
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@Defined2014: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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.

@Defined2014
Copy link
Contributor Author

/lgtm

@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 Nov 3, 2022
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9a84893

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 3, 2022
@ti-chi-bot ti-chi-bot merged commit 74ac033 into pingcap:master Nov 3, 2022
@Defined2014 Defined2014 deleted the fix-38862 branch November 3, 2022 13:44
@sre-bot
Copy link
Contributor

sre-bot commented Nov 3, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/common-test 🔴 failed 1, success 10, total 11 13 min Existing failure
idc-jenkins-ci-tidb/tics-test ✅ all 1 tests passed 5 min 23 sec Fixed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 28 min Existing passed
idc-jenkins-ci/integration-cdc-test 🟢 all 39 tests passed 21 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 42 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 54 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 11 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 3 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none 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
Development

Successfully merging this pull request may close these issues.

tidb deadlock during flashback with workload minSafeTS not change for about 10 minutes
6 participants