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

global config: fix etcd client not found (#6866) #6943

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6866

What problem does this PR solve?

Issue Number: Close #6860

What is changed and how does it work?

Check List

Tests

  • Integration test

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 10, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bufferflies
  • lhy1024

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 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-5.4 This PR is cherry-picked to release-5.4 from a source PR. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Aug 10, 2023
@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 labels Aug 10, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 10, 2023
@ti-chi-bot ti-chi-bot bot requested review from JmPotato and lhy1024 August 10, 2023 08:15
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 10, 2023
Copy link
Contributor

@lhy1024 lhy1024 left a comment

Choose a reason for hiding this comment

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

need to fix conlict

@HuSharp HuSharp force-pushed the cherry-pick-6866-to-release-5.4 branch from bb287a4 to 20b0b06 Compare August 10, 2023 08:21
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 10, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 10, 2023
@HuSharp
Copy link
Member

HuSharp commented Aug 10, 2023

/hold
I found tests are in another file, needs to change as well

@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 10, 2023
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp HuSharp force-pushed the cherry-pick-6866-to-release-5.4 branch from dacf8bf to b74fc07 Compare August 10, 2023 08:52
@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 Aug 10, 2023
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 10, 2023
@HuSharp
Copy link
Member

HuSharp commented Aug 10, 2023

/test build

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 10, 2023

@HuSharp: No presubmit jobs available for tikv/pd@release-5.4

In response to this:

/test build

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.

@HuSharp
Copy link
Member

HuSharp commented Aug 10, 2023

/retest

@HuSharp
Copy link
Member

HuSharp commented Aug 11, 2023

/test

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 11, 2023

@HuSharp: No presubmit jobs available for tikv/pd@release-5.4

In response to this:

/test

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.

@HuSharp
Copy link
Member

HuSharp commented Aug 11, 2023

/retest

@bufferflies
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 11, 2023

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

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 11, 2023

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

Commit hash: 7d52dcd

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

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 11, 2023

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

@codecov
Copy link

codecov bot commented Aug 11, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.30% ⚠️

Comparison is base (1198030) 74.83% compared to head (7d52dcd) 74.54%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-5.4    #6943      +/-   ##
===============================================
- Coverage        74.83%   74.54%   -0.30%     
===============================================
  Files              265      265              
  Lines            28012    28019       +7     
===============================================
- Hits             20963    20886      -77     
- Misses            5196     5267      +71     
- Partials          1853     1866      +13     
Flag Coverage Δ
unittests 74.54% <100.00%> (-0.30%) ⬇️

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

Files Changed Coverage Δ
server/grpc_service.go 51.05% <100.00%> (-0.69%) ⬇️
server/server.go 71.72% <100.00%> (-0.41%) ⬇️

... and 19 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ti-chi-bot ti-chi-bot bot merged commit 21b47d2 into tikv:release-5.4 Aug 11, 2023
@HuSharp HuSharp deleted the cherry-pick-6866-to-release-5.4 branch August 11, 2023 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants