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) #6935

Merged

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Aug 10, 2023

This is an automated cherry-pick of #6866

What problem does this PR solve?

Issue Number: Close #6860,#6858

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:

  • lhy1024
  • nolouch

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-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 requested review from JmPotato and rleungx August 10, 2023 07:05
Signed-off-by: husharp <[email protected]>
@HuSharp HuSharp force-pushed the cherry-pick-6866-to-release-7.1 branch from ac4b4d9 to ea212a7 Compare August 10, 2023 07:11
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 10, 2023
@@ -1835,6 +1836,9 @@ const globalConfigPath = "/global/config/"
// Since item value needs to support marshal of different struct types,
// it should be set to `Payload bytes` instead of `Value string`
func (s *GrpcServer) StoreGlobalConfig(_ context.Context, request *pdpb.StoreGlobalConfigRequest) (*pdpb.StoreGlobalConfigResponse, error) {
if s.client == nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to pick it to other branches?

Copy link
Member

Choose a reason for hiding this comment

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

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 10, 2023
@codecov
Copy link

codecov bot commented Aug 10, 2023

Codecov Report

Patch coverage: 89.32% and project coverage change: +0.02% 🎉

Comparison is base (f8bf1d7) 74.96% compared to head (ea212a7) 74.98%.
Report is 3 commits behind head on release-7.1.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-7.1    #6935      +/-   ##
===============================================
+ Coverage        74.96%   74.98%   +0.02%     
===============================================
  Files              406      406              
  Lines            40755    40820      +65     
===============================================
+ Hits             30551    30608      +57     
- Misses            7539     7541       +2     
- Partials          2665     2671       +6     
Flag Coverage Δ
unittests 74.98% <89.32%> (+0.02%) ⬆️

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

Files Changed Coverage Δ
client/errs/errno.go 100.00% <ø> (ø)
client/resource_group/controller/config.go 87.50% <ø> (ø)
client/resource_group/controller/limiter.go 72.06% <ø> (ø)
client/resource_group/controller/testutil.go 100.00% <ø> (ø)
pkg/schedule/placement/fit.go 94.94% <0.00%> (-1.08%) ⬇️
pkg/schedule/operator/create_operator.go 91.07% <72.72%> (-0.71%) ⬇️
pkg/schedule/checker/rule_checker.go 83.00% <76.92%> (-0.69%) ⬇️
client/resource_group/controller/controller.go 74.32% <100.00%> (+0.67%) ⬆️
pkg/schedule/operator/builder.go 86.68% <100.00%> (+0.08%) ⬆️
pkg/schedule/operator/operator.go 92.85% <100.00%> (ø)
... and 5 more

... and 30 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 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
@nolouch
Copy link
Contributor

nolouch commented Aug 10, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 10, 2023

@nolouch: 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 10, 2023

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

Commit hash: ea212a7

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 10, 2023
@ti-chi-bot ti-chi-bot bot merged commit e34a0a3 into tikv:release-7.1 Aug 10, 2023
17 checks passed
@HuSharp HuSharp deleted the cherry-pick-6866-to-release-7.1 branch August 10, 2023 08:24
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/M Denotes a PR that changes 30-99 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-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