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.

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

tiflow 7.6: Bump TiDB dependency to v7.6.0 #10680

Open
wants to merge 2 commits into
base: release-7.6
Choose a base branch
from

Conversation

kennytm
Copy link
Contributor

@kennytm kennytm commented Feb 29, 2024

What problem does this PR solve?

Issue Number: close #10679

What is changed and how it works?

Upgrade the go.mod version of tidb from pingcap/tidb@54d8a1416ab0 to pingcap/tidb@52794d985ba6 which is same as the tag v7.6.0.

This is required to bring in pingcap/tidb#50537, so that using a populated GCS sink won't cause DeadlineExceeded.

Check List

Tests

  • 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

None

Signed-off-by: kennytm <kennytm@gmail.com>
@kennytm kennytm added the type/enhancement This is a enhancement PR label Feb 29, 2024
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved The current cherry-pick pull request has not been approved and cannot be merged. labels Feb 29, 2024
Copy link
Contributor

ti-chi-bot bot commented Feb 29, 2024

This cherry pick PR is for a release branch and has not yet been approved by triage owners.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick:

  1. It must be approved by the approvers firstly.
  2. AFTER it has been approved by approvers, please wait for the cherry-pick merging approval from triage owners.

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.

Copy link
Contributor

ti-chi-bot bot commented Feb 29, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from kennytm. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 29, 2024
@kennytm kennytm added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 29, 2024
Signed-off-by: kennytm <kennytm@gmail.com>
Copy link
Contributor

ti-chi-bot bot commented Feb 29, 2024

@kennytm: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cdc-integration-storage-test 8cd574b link true /test cdc-integration-storage-test
pull-dm-integration-test 8cd574b link true /test dm-integration-test

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@@ -141,7 +167,12 @@ func (tr *Tracker) Init(
tableInfos: make(map[string]*DownstreamTableInfo),
}
// TODO: need to use upstream timezone to correctly check literal is in [1970, 2038]
se := executorContext{Context: mock.NewContext()}
seContext := mock.NewContext()
seContext.Store = &trackerMockStore{}
Copy link
Contributor

Choose a reason for hiding this comment

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

/cc @okJiang

can you check this change is expected? Can we move it into mock.NewContext()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i think this should be moved into mock.NewContext() or make GetBDRMode() not requiring a valid txn but that would involve updating TiDB first 🥲

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

But for v7.6, the pr is not merged.

Copy link
Member

Choose a reason for hiding this comment

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

can you check this change is expected? Can we move it into mock.NewContext()

Yes

Copy link
Contributor

@lance6716 lance6716 Mar 1, 2024

Choose a reason for hiding this comment

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

I just see it targets to release-7.6. We don't need to maintain non LTS versions 😂 If there's an user request I prefer we cherry-pick pingcap/tidb#50939 to TiDB's release-7.6 branch

(pingcap/tidb#50537 is merged into v7.6 because on that day it's not released)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if pingcap/tidb#50939 can be cherry-picked to 7.6 I'd prefer that ;)

@ti-chi-bot ti-chi-bot bot requested a review from okJiang March 1, 2024 06:19
@kennytm kennytm added type/cherry-pick-for-release-7.6 This PR is cherry-picked to release-7.6 from a source PR. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/cherry-pick-not-approved The current cherry-pick pull request has not been approved and cannot be merged. 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. type/cherry-pick-for-release-7.6 This PR is cherry-picked to release-7.6 from a source PR. type/enhancement This is a enhancement PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants