Skip to content

*: fix crash issue #6957

Merged
ti-chi-bot merged 1 commit intopingcap:masterfrom
solotzg:fix-6951
Mar 6, 2023
Merged

*: fix crash issue #6957
ti-chi-bot merged 1 commit intopingcap:masterfrom
solotzg:fix-6951

Conversation

@solotzg
Copy link
Contributor

@solotzg solotzg commented Mar 6, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #6951, caused by #6880

Problem Summary:

What is changed and how it works?

  • TrackedMppDataPacket in TrackedMppDataPacketPtr is mutable. If local_tracked_packet and remote_tracked_packet share same object, there is also another optional way to copy remote_tracked_packet early.
  • Use fast path to reduce maximum memory usage

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

@solotzg
fix-6951
a9e6031 
Signed-off-by: Zhigao Tong <tongzhigao@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 6, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SeaRise
  • windtalker

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/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 6, 2023
@solotzg
Copy link
Contributor Author

solotzg commented Mar 6, 2023

/run-all-tests

@solotzg solotzg changed the title [wip] *: fix crash issue caused by #6880 Mar 6, 2023
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 6, 2023
@solotzg solotzg changed the title *: fix crash issue caused by #6880 *: fix crash issue Mar 6, 2023
@solotzg solotzg added the type/bugfix This PR fixes a bug. label Mar 6, 2023
@solotzg solotzg requested review from SeaRise and windtalker March 6, 2023 02:40
@solotzg
Copy link
Contributor Author

solotzg commented Mar 6, 2023

/check-issue-triage-complete

SeaRise
SeaRise reviewed Mar 6, 2023
View reviewed changes
dbms/src/Flash/Mpp/MPPTunnelSetWriter.cpp
// TODO avoid copy packet for broadcast.
for (size_t i = 0, local_cnt = 0, remote_cnt = 0; i < tunnel_cnt; ++i)

if (local_tracked_packet == remote_tracked_packet)
Copy link
Contributor

@SeaRise SeaRise Mar 6, 2023

Choose a reason for hiding this comment

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

how about assert(local_tracked_packet != remote_tracked_packet) and copy packet in

tiflash/dbms/src/Flash/Mpp/MPPTunnelSetWriter.cpp

Line 178 in 0ff2b96

remote_tracked_packet = ori_tracked_packet;

Copy link
Contributor

@SeaRise SeaRise Mar 6, 2023

Choose a reason for hiding this comment

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

Or

if (local_tracked_packet != nullptr && local_tracked_packet == remote_tracked_packet)
    local_tracked_packet = local_tracked_packet->copy();

It looks like the total number of copies is the same.

Copy link
Contributor Author

@solotzg solotzg Mar 6, 2023

Choose a reason for hiding this comment

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

Current way is aimed to reduce maximum memory usage.

windtalker
windtalker approved these changes Mar 6, 2023
View reviewed changes
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

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 6, 2023
@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 6, 2023
@solotzg
Copy link
Contributor Author

solotzg commented Mar 6, 2023

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 6, 2023

@solotzg: 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

ti-chi-bot commented Mar 6, 2023

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

DetailsCommit hash: a9e6031

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 6, 2023
@ti-chi-bot ti-chi-bot merged commit 03510c9 into pingcap:master Mar 6, 2023
@solotzg solotzg deleted the fix-6951 branch March 6, 2023 03:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@windtalker windtalker windtalker approved these changes

+1 more reviewer

@SeaRise SeaRise SeaRise approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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/bugfix This PR fixes a bug.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

TiFlash crash in the failpoint test

4 participants

@solotzg @ti-chi-bot @windtalker @SeaRise