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

Jump to bottom

*: fix deadlock in new processor (#1987) #2017

Merged
merged 6 commits into from
Aug 11, 2021
Merged

*: fix deadlock in new processor (#1987) #2017

merged 6 commits into from
Aug 11, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1987

What problem does this PR solve?

  • When the new processor is enabled, deadlock can occur when the Unified Sorter is blocked due to the sink not being able to handle the large amount of data.

What is changed and how it works?

  • Redesigned some details in the Unified Sorter so that the outputCh never blocks AddEntry.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test

Side effects

  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch

Release note

  • Fix deadlock

@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#1987
810fd7a 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jun 10, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei

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.

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/cherry-pick-not-approved status/ptal Could you please take a look? release-blocker This issue blocks a release. Please solve it ASAP. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels Jun 10, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 10, 2021
Merged
@ti-chi-bot ti-chi-bot requested a review from zier-one June 10, 2021 08:27
@ti-chi-bot ti-chi-bot requested a review from liuzix June 10, 2021 08:27
@lonng lonng added this to the v4.0.14 milestone Jun 10, 2021
@amyangfei amyangfei removed the release-blocker This issue blocks a release. Please solve it ASAP. label Jun 10, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 30, 2021
@lonng lonng added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 6, 2021
@amyangfei amyangfei modified the milestones: v4.0.14, v4.0.15 Jul 12, 2021
@amyangfei
Copy link
Contributor

please resolve conflicts @liuzix

@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2021
@overvenus
Copy link
Member

/run-all-tests

@codecov-commenter
Copy link

codecov-commenter commented Aug 10, 2021 •
edited
Loading

Codecov Report

Merging #2017 (472b2ab) into release-4.0 (753073a) will increase coverage by 1.3813%.
The diff coverage is 57.6503%.

@@                 Coverage Diff                 @@
##           release-4.0      #2017        +/-   ##
===================================================
+ Coverage      53.7661%   55.1474%   +1.3813%     
===================================================
  Files              153        164        +11     
  Lines            15958      19466      +3508     
===================================================
+ Hits              8580      10735      +2155     
- Misses            6475       7717      +1242     
- Partials           903       1014       +111

@lonng
Copy link
Contributor

lonng commented Aug 11, 2021

/merge

@ti-chi-bot
Copy link
Member Author

@lonng: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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 added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 11, 2021
@amyangfei amyangfei added the require-LGT1 Indicates that the PR requires an LGTM. label Aug 11, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 472b2ab

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

liuzix commented Aug 11, 2021

/run-kafka-integration-tests

@liuzix
Copy link
Contributor

liuzix commented Aug 11, 2021

/run-kafka-integration-test

@amyangfei
Copy link
Contributor

/run-kafka-tests

1 similar comment
@liuzix
Copy link
Contributor

liuzix commented Aug 11, 2021

/run-kafka-tests

@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: 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.

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 75e413e into pingcap:release-4.0 Aug 11, 2021
duanhuichao pushed a commit to duanhuichao/tiflow that referenced this pull request Mar 25, 2022
(dm) [bugfix] backward compatibility with show command pingcap#5017
b76014d 
Problem:
With the version upgrade, on the new version of MySQL Cluster,
the query results of many system commands will display some new
columns. These new columns show new features or information of MySQL.

In general, it is recommended to provide backward compatibility of
system commands (e.g., show xxx) rather than hard-coded return value
format (i.e., limiting the number of returned columns).

For DM, there are some commands that are difficult to backward-compatible:
(1) SHOW MASTER STATUS
(2) SHOW SLAVE HOSTS
(3) SHOW BINARY LOGS

Fix:
Through the reflection mechanism, we only take the value of the required
corresponding column and do not limit the number of returned columns.
This patch removes the limit on the number of columns returned by the
'show slave hosts' command.

ref pingcap#2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei approved these changes

@zier-one zier-one Awaiting requested review from zier-one

@liuzix liuzix Awaiting requested review from liuzix

Assignees

@liuzix liuzix

Labels
cherry-pick-approved Cherry pick PR approved by release team. require-LGT1 Indicates that the PR requires an LGTM. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. status/ptal Could you please take a look? type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.
Projects
None yet
Milestone
v4.0.15
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @amyangfei @overvenus @codecov-commenter @lonng @liuzix