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

dm: upgrade go-mysql library (#11043) #11189

Merged
merged 4 commits into from
May 28, 2024
Merged

dm: upgrade go-mysql library (#11043) #11189

merged 4 commits into from
May 28, 2024

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #11043

What problem does this PR solve?

Issue Number: close #11041

What is changed and how it works?

Check List

Tests

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

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note 

upgrade go-mysql to fix the connection blocked when read handshake packet

@D3Hunter @ti-chi-bot
This is an automated cherry-pick of pingcap#11043
2b76ae9 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 28, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request May 28, 2024
Merged
1 task
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels May 28, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label May 28, 2024
@ti-chi-bot ti-chi-bot bot added the area/dm Issues or PRs related to DM. label May 28, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label May 28, 2024
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed do-not-merge/cherry-pick-not-approved size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 28, 2024
@ti-chi-bot ti-chi-bot bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 28, 2024
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 28, 2024
Benjamin2037
Benjamin2037 approved these changes May 28, 2024
View reviewed changes
Copy link
Contributor

@Benjamin2037 Benjamin2037 left a comment

Choose a reason for hiding this comment

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

LGTM

D3Hunter
D3Hunter reviewed May 28, 2024
View reviewed changes
dm/pkg/binlog/event/common.go
@@ -163,7 +163,11 @@ func GTIDIncrease(flavor string, gSet gmysql.GTIDSet) (gmysql.GTIDSet, error) {
mariaGTID := singleGTID.(*gmysql.MariadbGTID)
mariaGTID.SequenceNumber++
gtidSet := new(gmysql.MariadbGTIDSet)
gtidSet.Sets = map[uint32]*gmysql.MariadbGTID{mariaGTID.DomainID: mariaGTID}
gtidSet.Sets = map[uint32]map[uint32]*gmysql.MariadbGTID{
Copy link
Contributor

Choose a reason for hiding this comment

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

this and below part is copied from https://github.com/pingcap/tiflow/pull/10753/files#diff-7d0132544845cb9d5d4fbef67bdd54ba574cc5664f806e49fe1530aefad8cfa2

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 28, 2024

@tangenta: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, D3Hunter, tangenta

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@D3Hunter
Copy link
Contributor

/retest

@lance6716
Copy link
Contributor

/retest

@D3Hunter
Copy link
Contributor

/retest

2 similar comments
@D3Hunter
Copy link
Contributor

/retest

@D3Hunter
Copy link
Contributor

/retest

@ti-chi-bot ti-chi-bot bot merged commit 26b901c into pingcap:release-7.5 May 28, 2024
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@D3Hunter D3Hunter D3Hunter approved these changes

@Benjamin2037 Benjamin2037 Benjamin2037 approved these changes

@tangenta tangenta tangenta approved these changes

Assignees

@D3Hunter D3Hunter

Labels
approved area/dm Issues or PRs related to DM. cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @D3Hunter @lance6716 @Benjamin2037 @tangenta