Skip to content

fix potential mpp task leak (#2338)#2341

Merged
ti-srebot merged 4 commits intopingcap:release-5.1from
ti-srebot:release-5.1-f0733d9677ee
Jul 15, 2021
Merged

fix potential mpp task leak (#2338)#2341
ti-srebot merged 4 commits intopingcap:release-5.1from
ti-srebot:release-5.1-f0733d9677ee

Conversation

@ti-srebot
Copy link
Collaborator

@ti-srebot ti-srebot commented Jul 7, 2021

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

# In tics repo:
git pr https://github.com/pingcap/tics/pull/2341

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

git push git@github.com:ti-srebot/tics.git pr/2341:release-5.1-f0733d9677ee

What problem does this PR solve?

Issue Number: close #2322

Problem Summary:
As the issue decribed.

What is changed and how it works?

Proposal: xxx

What's Changed:

  1. catch exception for each tunnel during MPPTask::writeErrToAllTunnel
  2. make sure finished flag is set in MPPTunnel::close()
  3. Do not hold sender task in EstablishMPPConnection

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch:

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

Release note

  • fix potential mpp task leak

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added CHERRY-PICK cherry pick status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug. labels Jul 7, 2021
@ti-srebot ti-srebot requested a review from JaySon-Huang July 7, 2021 03:36
@ti-srebot ti-srebot added this to the v5.1.1 milestone Jul 7, 2021
Copy link
Contributor

@windtalker windtalker left a comment

Choose a reason for hiding this comment

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

LGTM

@windtalker
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 15, 2021
@ti-srebot
Copy link
Collaborator Author

Your auto merge job has been accepted, waiting for:

  • 2292
  • 2407

@ti-srebot
Copy link
Collaborator Author

/run-all-tests

@ti-srebot
Copy link
Collaborator Author

@ti-srebot merge failed.

@windtalker
Copy link
Contributor

/merge

@ti-srebot
Copy link
Collaborator Author

/run-all-tests

@ti-srebot ti-srebot merged commit 4eda3a5 into pingcap:release-5.1 Jul 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CHERRY-PICK cherry pick status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants