Skip to content

fix a bug that ExchangeReceiver can't be canceled (#4441)#4445

Merged
ti-chi-bot merged 8 commits intopingcap:release-6.0from
ti-chi-bot:cherry-pick-4441-to-release-6.0
Mar 26, 2022
Merged

fix a bug that ExchangeReceiver can't be canceled (#4441)#4445
ti-chi-bot merged 8 commits intopingcap:release-6.0from
ti-chi-bot:cherry-pick-4441-to-release-6.0

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Mar 25, 2022

This is an automated cherry-pick of #4441

What problem does this PR solve?

Issue Number: close #4432

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • 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

None

@bestwoody @ti-chi-bot
close receiver early
0d381ea 
Signed-off-by: bestwoody <bestwoody@163.com>
@bestwoody @ti-chi-bot
update
792ff27 
Signed-off-by: bestwoody <bestwoody@163.com>
@bestwoody @ti-chi-bot
update
57cd1ff 
Signed-off-by: bestwoody <bestwoody@163.com>
@bestwoody @ti-chi-bot
add state check of exchgRecv
a63d051 
Signed-off-by: bestwoody <bestwoody@163.com>
@bestwoody @ti-chi-bot
refine code
54f58c1
@bestwoody @ti-chi-bot
use runtime assert instead
ee5fbdf 
Signed-off-by: bestwoody <bestwoody@163.com>
@bestwoody @ti-chi-bot
revert runtime_assert
b1ca17e
@bestwoody @ti-chi-bot
slim
9baae7e 
Signed-off-by: bestwoody <bestwoody@163.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 25, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bestwoody
  • solotzg

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 the release-note-none Denotes a PR that doesn't merit a release note. label Mar 25, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 25, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.0 labels Mar 25, 2022
bestwoody
bestwoody approved these changes Mar 25, 2022
View reviewed changes
Copy link
Contributor

@bestwoody bestwoody left a comment

Choose a reason for hiding this comment

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

lgtm

@bestwoody bestwoody requested a review from fzhedu March 25, 2022 14:54
@bestwoody bestwoody requested a review from solotzg March 25, 2022 15:32
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 25, 2022
@bestwoody bestwoody self-requested a review March 26, 2022 03:03
bestwoody
bestwoody approved these changes Mar 26, 2022
View reviewed changes
Copy link
Contributor

@bestwoody bestwoody left a comment

Choose a reason for hiding this comment

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

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 Mar 26, 2022
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Mar 26, 2022
@VelocityLight
Copy link

VelocityLight commented Mar 26, 2022

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 26, 2022

@VelocityLight: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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
Copy link
Member Author

ti-chi-bot commented Mar 26, 2022

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

DetailsCommit hash: 9baae7e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 26, 2022
@ti-chi-bot ti-chi-bot merged commit 81025ae into pingcap:release-6.0 Mar 26, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Mar 26, 2022

Coverage for changed files

Filename                                   Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
DataStreams/TiRemoteBlockInputStream.h         103               103     0.00%          15                15     0.00%         150               150     0.00%          56                56     0.00%
Flash/Coprocessor/CoprocessorReader.h           49                49     0.00%          11                11     0.00%          80                80     0.00%          32                32     0.00%
Flash/Coprocessor/DAGContext.cpp                91                67    26.37%          25                17    32.00%         204               167    18.14%          64                54    15.62%
Flash/Coprocessor/DAGContext.h                  31                13    58.06%          24                12    50.00%          72                30    58.33%           8                 3    62.50%
Flash/Mpp/ExchangeReceiver.cpp                 304               304     0.00%          32                32     0.00%         459               459     0.00%         190               190     0.00%
Flash/Mpp/ExchangeReceiver.h                     9                 9     0.00%           7                 7     0.00%          15                15     0.00%           2                 2     0.00%
Flash/Mpp/MPPTask.cpp                          417               417     0.00%          21                21     0.00%         350               350     0.00%         190               190     0.00%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                         1004               962     4.18%         135               115    14.81%        1330              1251     5.94%         542               527     2.77%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16980      9544             43.79%    191338  96875        49.37%

full coverage report (for internal network access only)

@JaySon-Huang JaySon-Huang added this to the v6.0.0 milestone Apr 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@solotzg solotzg solotzg approved these changes

@fuzhe1989 fuzhe1989 Awaiting requested review from fuzhe1989

@windtalker windtalker Awaiting requested review from windtalker

@fzhedu fzhedu Awaiting requested review from fzhedu

+1 more reviewer

@bestwoody bestwoody bestwoody approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@bestwoody bestwoody

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/M Denotes a PR that changes 30-99 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.0

Projects

None yet

Milestone

v6.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@ti-chi-bot @VelocityLight @sre-bot @solotzg @bestwoody @JaySon-Huang