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

*: upgrade etcd to v3.4.31 #8017

Merged
merged 6 commits into from Apr 7, 2024

Conversation

asddongmen
Copy link
Contributor

@asddongmen asddongmen commented Apr 3, 2024

What problem does this PR solve?

Issue Number: Close #8018, ref #5520

What is changed and how does it work?

Upgrade etcd to v3.4.31 to fix the etcd issue: https://github.com/etcd-io/etcd/issues/15247

Check List

Tests

  • No code

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note

None.

Copy link
Contributor

ti-chi-bot bot commented Apr 3, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HuSharp
  • rleungx

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 bot requested review from disksing and JmPotato April 3, 2024 02:17
@ti-chi-bot ti-chi-bot bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 3, 2024
@HuSharp HuSharp requested review from HuSharp and rleungx and removed request for disksing April 3, 2024 02:24
go.mod Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 3, 2024
Signed-off-by: dongmen <414110582@qq.com>
Signed-off-by: dongmen <414110582@qq.com>
Signed-off-by: dongmen <414110582@qq.com>
Copy link
Member

@rleungx rleungx left a comment

Choose a reason for hiding this comment

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

The rest LGTM

go.mod Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 3, 2024
Signed-off-by: dongmen <414110582@qq.com>
github.com/prometheus/client_golang v1.18.0
github.com/spf13/cobra v1.0.0
github.com/prometheus/client_golang v1.19.0
github.com/spf13/cobra v1.8.0
Copy link
Member

@HuSharp HuSharp Apr 3, 2024

Choose a reason for hiding this comment

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

https://github.com/tikv/pd/actions/runs/8532798384/job/23374503402?pr=8017

ci failed because msg not contain "fail"

re.Contains(string(output), "Fail")

It seems like after updating this library, achieved the right redirect to stderr (maybe fixed by this spf13/cobra#894)

Maybe you need to add root.SetErr(buf) in I have supportted another pr to fix it:)

func ExecuteCommand(root *cobra.Command, args ...string) (output []byte, err error) {

cc @rleungx

Copy link
Member

Choose a reason for hiding this comment

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

fixed in #8021

@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 3, 2024
Signed-off-by: dongmen <414110582@qq.com>
@ti-chi-bot ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 3, 2024
Signed-off-by: dongmen <414110582@qq.com>
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 7, 2024
@HuSharp
Copy link
Member

HuSharp commented Apr 7, 2024

/merge

Copy link
Contributor

ti-chi-bot bot commented Apr 7, 2024

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

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.

Copy link
Contributor

ti-chi-bot bot commented Apr 7, 2024

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

Commit hash: c4f1fe0

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 7, 2024
Copy link

codecov bot commented Apr 7, 2024

Codecov Report

Merging #8017 (c4f1fe0) into master (fff288d) will decrease coverage by 0.09%.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8017      +/-   ##
==========================================
- Coverage   73.58%   73.50%   -0.09%     
==========================================
  Files         436      436              
  Lines       48525    48525              
==========================================
- Hits        35709    35666      -43     
- Misses       9757     9787      +30     
- Partials     3059     3072      +13     
Flag Coverage Δ
unittests 73.50% <100.00%> (-0.09%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@ti-chi-bot ti-chi-bot bot merged commit 7179657 into tikv:master Apr 7, 2024
25 of 26 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #8025.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Apr 7, 2024
ref tikv#5520, close tikv#8018

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none 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.

Upgrade etcd to v3.4.31 to fix changefeed lag
4 participants