Skip to content

ddl: fix ddl hang over when it meets panic in cancelling path (#23204)#23297

Merged
ti-chi-bot merged 7 commits intopingcap:release-4.0from
ti-srebot:release-4.0-46f5f217725e
Mar 16, 2021
Merged

ddl: fix ddl hang over when it meets panic in cancelling path (#23204)#23297
ti-chi-bot merged 7 commits intopingcap:release-4.0from
ti-srebot:release-4.0-46f5f217725e

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 13, 2021 •
edited
Loading

cherry-pick #23204 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/23297

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/23297:release-4.0-46f5f217725e

Signed-off-by: ailinkid 314806019@qq.com

What problem does this PR solve?

Issue Number: close #23202

What is changed and how it works?

What's Changed:
record the error count when the goroutine restored from panic.

Check List

Tests

  • Unit test
  • Integration test

Release note

  • fix ddl hang over when it meets panic in cancelling path.

@AilinKid @ti-srebot
cherry pick pingcap#23204 to release-4.0
2be560d 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Mar 13, 2021

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Mar 13, 2021
Merged
@ti-srebot ti-srebot added sig/sql-infra SIG: SQL Infra size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/4.0-cherry-pick labels Mar 13, 2021
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 13, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Mar 13, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Mar 13, 2021

@AilinKid you're already a collaborator in bot's repo.

@AilinKid
remote resolves
59b92e8 
Signed-off-by: ailinkid <314806019@qq.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 15, 2021
@AilinKid
Copy link
Contributor

AilinKid commented Mar 15, 2021

/run-check_dev

@zimulala
Copy link
Contributor

zimulala commented Mar 15, 2021

/LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 15, 2021
@AilinKid
Copy link
Contributor

AilinKid commented Mar 15, 2021

/build

@AilinKid
Copy link
Contributor

AilinKid commented Mar 15, 2021

/build

@bb7133
Copy link
Member

bb7133 commented Mar 15, 2021

/lgtm

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 15, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • zimulala

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Mar 15, 2021
@bb7133
Copy link
Member

bb7133 commented Mar 15, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 15, 2021

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

DetailsCommit hash: d303a90

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 15, 2021
@AilinKid
Copy link
Contributor

AilinKid commented Mar 15, 2021

/run-check_dev

@AilinKid
Copy link
Contributor

AilinKid commented Mar 15, 2021

do not merge now, I'm trying to fix an issue in check-dev with an error like that


[2021-03-15T07:13:17.203Z] ----------------------------------------------------------------------

[2021-03-15T07:13:17.203Z] FAIL: db_integration_test.go:1300: testIntegrationSuite2.TestAddIndexAfterAddColumn

[2021-03-15T07:13:17.203Z] 

[2021-03-15T07:13:17.203Z] db_integration_test.go:1308:

[2021-03-15T07:13:17.203Z]     s.tk.MustGetErrCode(sql, errno.ErrDupEntry)

[2021-03-15T07:13:17.203Z] /home/jenkins/agent/workspace/tidb_ghpr_check/go/src/github.com/pingcap/tidb/util/testkit/testkit.go:300:

[2021-03-15T07:13:17.203Z]     tk.c.Assert(int(sqlErr.Code), check.Equals, errCode, check.Commentf("Assertion failed, origin err:\n  %v", sqlErr))

[2021-03-15T07:13:17.203Z] ... obtained int = 1105

[2021-03-15T07:13:17.203Z] ... expected int = 1062

[2021-03-15T07:13:17.203Z] ... Assertion failed, origin err:

[2021-03-15T07:13:17.203Z]   ERROR 1105 (HY000): json: cannot unmarshal object into Go value of type bool

@AilinKid
fix json unmarsh error
1d5dd09 
Signed-off-by: ailinkid <314806019@qq.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 15, 2021
@AilinKid
Copy link
Contributor

AilinKid commented Mar 16, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 16, 2021

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

DetailsCommit hash: 3d4bb86

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 16, 2021
@AilinKid
Copy link
Contributor

AilinKid commented Mar 16, 2021

/run-unit-test

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 16, 2021

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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 ti-chi-bot merged commit 4a672e7 into pingcap:release-4.0 Mar 16, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.12 Mar 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crazycs520 crazycs520 Awaiting requested review from crazycs520

@xhebox xhebox Awaiting requested review from xhebox

@zimulala zimulala Awaiting requested review from zimulala

Assignees

@AilinKid AilinKid

Labels

sig/sql-infra SIG: SQL Infra size/L Denotes a PR that changes 100-499 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/4.0-cherry-pick

Projects

None yet

Milestone

v4.0.12

Development

Successfully merging this pull request may close these issues.

6 participants

@ti-srebot @AilinKid @zimulala @bb7133 @ti-chi-bot @zhouqiang-cl