Skip to content

session: fix deadlock when init domain failed (#40409)#40413

Merged
ti-chi-bot merged 2 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40409-to-release-6.1
Jan 9, 2023
Merged

session: fix deadlock when init domain failed (#40409)#40413
ti-chi-bot merged 2 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40409-to-release-6.1

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Jan 9, 2023

This is an automated cherry-pick of #40409

What problem does this PR solve?

Issue Number: close #40408

Problem Summary:

What is changed and how it works?

Check List

Tests 


goroutine 1 [semacquire, 33 minutes]:
sync.runtime_SemacquireMutex(0xc0005aa480?, 0x0?, 0x0?)
	/usr/local/go/src/runtime/sema.go:77 +0x25
sync.(*Mutex).lockSlow(0x7bad560)
	/usr/local/go/src/sync/mutex.go:171 +0x165
sync.(*Mutex).Lock(...)
	/usr/local/go/src/sync/mutex.go:90
github.com/pingcap/tidb/session.(*domainMap).Delete(0x7bad560, {0x538e730?, 0xc000467810?})
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/session/tidb.go:112 +0x50
github.com/pingcap/tidb/session.(*domainMap).Get.func1.1()
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/session/tidb.go:85 +0x25
github.com/pingcap/tidb/domain.(*Domain).Close(0xc000068780)
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/domain/domain.go:872 +0x18d
github.com/pingcap/tidb/session.(*domainMap).Get.func1()
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/session/tidb.go:96 +0x606
github.com/pingcap/tidb/util.RunWithRetry(0x1e, 0x1f4, 0xc0016509f0)
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/util/misc.go:69 +0x89
github.com/pingcap/tidb/session.(*domainMap).Get(0x7bad560, {0x538e730, 0xc000467810})
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/session/tidb.go:76 +0x1d6
github.com/pingcap/tidb/session.createSessionWithOpt({0x538e730, 0xc000467810}, 0x0)
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/session/session.go:3122 +0x59
github.com/pingcap/tidb/session.CreateSessionWithOpt({0x538e730, 0xc000467810}, 0xc000c3ec68?)
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/session/session.go:2710 +0x3b
github.com/pingcap/tidb/session.CreateSession(...)
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/session/session.go:2704
github.com/pingcap/tidb/br/pkg/gluetidb.Glue.UseOneShotSession({{}, {{}}}, {0x538e730, 0xc000467810}, 0x1, 0xc0009f2f90)
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/br/pkg/gluetidb/glue.go:119 +0x5e
github.com/pingcap/tidb/br/pkg/task.RunBackup({0x5366770, 0xc000b60c00}, {0x537f180?, 0x7be8c00?}, {0x4c1289f, 0xb}, 0xc00002c700)
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/br/pkg/task/backup.go:353 +0x7a8
main.runBackupCommand(0xc000a07b00, {0x4c1289f, 0xb})
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/br/cmd/br/backup.go:48 +0x418
main.newFullBackupCommand.func1(0xc000a07b00?, {0xc000a16a00?, 0xa?, 0xa?})
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/br/cmd/br/backup.go:117 +0x25
github.com/spf13/cobra.(*Command).execute(0xc000a07b00, {0xc00021e2a0, 0xa, 0xa})
	/go/pkg/mod/github.com/spf13/cobra@v1.6.1/command.go:916 +0x862
github.com/spf13/cobra.(*Command).ExecuteC(0xc00054ac00)
	/go/pkg/mod/github.com/spf13/cobra@v1.6.1/command.go:1044 +0x3bd
github.com/spf13/cobra.(*Command).Execute(...)
	/go/pkg/mod/github.com/spf13/cobra@v1.6.1/command.go:968
main.main()
	/home/jenkins/agent/workspace/build-common/go/src/github.com/pingcap/br/br/cmd/br/main.go:57 +0x33c

After this PR, it will return err1 instead of deadlock.
image

  • 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

@Defined2014 @ti-chi-bot
This is an automated cherry-pick of pingcap#40409
157abe9 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jan 9, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 9, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Defined2014
  • 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.

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 do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Jan 9, 2023
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 9, 2023
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 9, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 9, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 9, 2023
@Defined2014
Copy link
Contributor

Defined2014 commented Jan 9, 2023

/test check-dev2

@Defined2014
Copy link
Contributor

Defined2014 commented Jan 9, 2023

/test check-dev

1 similar comment
@Defined2014
Copy link
Contributor

Defined2014 commented Jan 9, 2023

/test check-dev

@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 Jan 9, 2023
@Defined2014
Copy link
Contributor

Defined2014 commented Jan 9, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 9, 2023

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

DetailsCommit hash: 8f7d8cd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 9, 2023
@purelind
Copy link
Contributor

purelind commented Jan 9, 2023

/test check-dev

@ti-chi-bot ti-chi-bot merged commit 1d0122a into pingcap:release-6.1 Jan 9, 2023
@Defined2014 Defined2014 deleted the cherry-pick-40409-to-release-6.1 branch January 10, 2023 01:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hawkingrei hawkingrei hawkingrei approved these changes

@Defined2014 Defined2014 Defined2014 approved these changes

@xhebox xhebox Awaiting requested review from xhebox

Assignees

@Defined2014 Defined2014

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. 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. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @Defined2014 @purelind @hawkingrei @VelocityLight