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.

Sign up for GitHub

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: migrate test-infra to testify for tidb_test.go and bootstrap_test.go #28555

Merged
merged 8 commits into from
Oct 11, 2021
Merged

session: migrate test-infra to testify for tidb_test.go and bootstrap_test.go #28555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f3da26
session: migrate test-infra to testify for tidb_test.go and bootstrap…
tisonkun Oct 7, 2021
0643d2d
fix leaks
tisonkun Oct 7, 2021
85dcdbc
Merge branch 'master' into session-testify
tisonkun Oct 7, 2021
38ecc25
ignore unknown leaks
tisonkun Oct 7, 2021
70c6706
Update session/bootstrap_serial_test.go
tisonkun Oct 9, 2021
098bc9c
test mysql.global_grants
tisonkun Oct 9, 2021
82f1273
Merge branch 'master' into session-testify
tisonkun Oct 10, 2021
ac6a0db
ignore unknown leak
tisonkun Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ddl/ddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ func (d *ddl) doDDLJob(ctx sessionctx.Context, job *model.Job) error {
i := 0
for {
failpoint.Inject("storeCloseInLoop", func(_ failpoint.Value) {
d.cancel()
_ = d.Stop()
Copy link
Contributor Author

@tisonkun tisonkun Oct 7, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

@lance6716 at this line only, so that we don't just cancel the context but trigger a graceful shutdown. I'm unsure whether or not it is the original failpoint want to do. In another way, we can ignore the leak.

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree with this change.

The original failpoint is to imitate that the TiDB-as-a-library is being closed when handling a DDL, to check if the goroutine is stuck inside this for-loop. My original test code is #18714 , but after some iterations it becomes current invasive failpoint 😂

I'll review rest of code tomorrow

})

select {
Expand Down
Loading