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

*(both): update dep of etcd, go-mysql and others #4755

Merged
merged 16 commits into from
Mar 7, 2022

Conversation

lance6716
Copy link
Contributor

@lance6716 lance6716 commented Mar 3, 2022

Signed-off-by: lance6716 [email protected]

What problem does this PR solve?

Issue Number: ref #4418

What is changed and how it works?

main purpose is

Updating tidb-tools need updating etcd, and further need update many places

Check List

Tests

  • Integration test (dm/tests/adjust_gtid/data/db2.increment.sql)

Code changes

Side effects

Related changes

Release note

`None`.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 3, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • lichunzhu

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/needs-triage-completed release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 3, 2022
@lance6716
Copy link
Contributor Author

/check-issue-triage-complete

@lance6716
Copy link
Contributor Author

/run-all-tests

Signed-off-by: lance6716 <[email protected]>
Copy link
Contributor

@amyangfei amyangfei left a comment

Choose a reason for hiding this comment

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

Which release branch will be cherry-picked to?

Comment on lines -104 to -106
// cloud.google.com/go/storage will upgrade grpc to v1.40.0
// we need keep the replacement until go.etcd.io supports the higher version of grpc.
google.golang.org/grpc v1.40.0 => google.golang.org/grpc v1.29.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Why we need to pin grpc to v1.29.1 before this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

introduced in #2833 @maxshuang PTAL

Copy link
Contributor

Choose a reason for hiding this comment

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

grpc has directory changes, old etcd cannot use newer grpc.

Copy link
Contributor

@lichunzhu lichunzhu 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 3, 2022
Comment on lines +84 to +89
go.etcd.io/etcd/api/v3 v3.5.2
go.etcd.io/etcd/client/pkg/v3 v3.5.2
go.etcd.io/etcd/client/v3 v3.5.2
go.etcd.io/etcd/pkg/v3 v3.5.2
go.etcd.io/etcd/server/v3 v3.5.2
go.etcd.io/etcd/tests/v3 v3.5.2
Copy link
Member

Choose a reason for hiding this comment

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

Which version does PD use?

Copy link
Contributor Author

@lance6716 lance6716 Mar 3, 2022

Choose a reason for hiding this comment

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

@disksing has updated all active repos but forgotten us 😭

Copy link
Contributor

@disksing disksing Mar 3, 2022

Choose a reason for hiding this comment

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

pd/server uses old version but pd/client (and also client-go/tidb) uses v3.5.2

@lance6716
Copy link
Contributor Author

Which release branch will be cherry-picked to?

pingcap/tidb#32457 TiDB doesn't cherry-pick

Signed-off-by: lance6716 <[email protected]>
@lance6716
Copy link
Contributor Author

/run-all-tests

@lance6716
Copy link
Contributor Author

/run-all-tests

@lance6716
Copy link
Contributor Author

/run-kafka-integration-test

@lance6716
Copy link
Contributor Author

/run-leak-test
/run-dm-integration-test
/run-verify

@lance6716
Copy link
Contributor Author

/run-all-tests

@lance6716
Copy link
Contributor Author

/run-all-tests

1 similar comment
@lance6716
Copy link
Contributor Author

/run-all-tests

Signed-off-by: lance6716 <[email protected]>
@lance6716
Copy link
Contributor Author

/run-all-tests

@lance6716
Copy link
Contributor Author

/run-all-tests

@lance6716
Copy link
Contributor Author

/run-integration-test /tikv=pr/12050
/run-kafka-integration-test /tikv=pr/12050

@lance6716
Copy link
Contributor Author

/run-all-tests

all tests (except for CDC's broken CI) should have passed now, PTAL @amyangfei @overvenus @hi-rustin

@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 4, 2022
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f74cd61

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 4, 2022
@disksing
Copy link
Contributor

disksing commented Mar 7, 2022

/run-integration-test

@disksing
Copy link
Contributor

disksing commented Mar 7, 2022

/run-kafka-integration-test

@lance6716
Copy link
Contributor Author

waiting #4783 to fix CI

@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@lance6716: 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.

@lance6716
Copy link
Contributor Author

/run-verify

@ti-chi-bot ti-chi-bot merged commit eeacb25 into pingcap:master Mar 7, 2022
@lance6716 lance6716 deleted the update-dep branch October 13, 2022 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

time "-00:00:00.01" parse value is not right
6 participants