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

resource_manager: fix gosigar import package #6735

Merged
merged 2 commits into from Jul 4, 2023

Conversation

HuSharp
Copy link
Member

@HuSharp HuSharp commented Jul 3, 2023

What problem does this PR solve?

Issue Number: Close #6734

What is changed and how does it work?

In TiDB we introduced cloudfoundry/gosigar
But in PD we introduced elastic/gosigar
Some compatibility issues may be encountered in both components

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 3, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • 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.

@HuSharp HuSharp requested a review from CabinfeverB July 3, 2023 03:11
@ti-chi-bot ti-chi-bot bot requested review from disksing and nolouch July 3, 2023 03:11
@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 3, 2023
@@ -9,6 +9,7 @@ require (
github.com/prometheus/client_golang v1.11.1
github.com/tikv/pd/client v0.0.0-00010101000000-000000000000
go.uber.org/zap v1.24.0
google.golang.org/grpc v1.54.0
Copy link
Contributor

Choose a reason for hiding this comment

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

why import this?

Copy link
Member Author

@HuSharp HuSharp Jul 3, 2023

Choose a reason for hiding this comment

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

Copy link
Contributor

@bufferflies bufferflies left a comment

Choose a reason for hiding this comment

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

rest lgtm

@codecov
Copy link

codecov bot commented Jul 3, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.21 🎉

Comparison is base (9a3af11) 74.31% compared to head (484c5fd) 74.53%.

❗ Current head 484c5fd differs from pull request most recent head 4449094. Consider uploading reports for the commit 4449094 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6735      +/-   ##
==========================================
+ Coverage   74.31%   74.53%   +0.21%     
==========================================
  Files         411      417       +6     
  Lines       42960    43630     +670     
==========================================
+ Hits        31927    32520     +593     
- Misses       8176     8216      +40     
- Partials     2857     2894      +37     
Flag Coverage Δ
unittests 74.53% <100.00%> (+0.21%) ⬆️

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

Impacted Files Coverage Δ
client/resource_group/controller/model.go 57.57% <100.00%> (ø)

... and 55 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: husharp <jinhao.hu@pingcap.com>
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 3, 2023
@HuSharp
Copy link
Member Author

HuSharp commented Jul 3, 2023

/check-issue-triage-complete

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 3, 2023
@HuSharp HuSharp requested review from lhy1024 and removed request for nolouch and disksing July 3, 2023 08:41
@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 Jul 3, 2023
@bufferflies
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 4, 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 Jul 4, 2023

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

Commit hash: 484c5fd

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

ti-chi-bot bot commented Jul 4, 2023

@HuSharp: Your PR was out of date, I have automatically updated it for you.

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.

@ti-chi-bot ti-chi-bot bot merged commit a7eedd2 into tikv:master Jul 4, 2023
22 checks passed
@HuSharp HuSharp changed the title resource_manage: fix gosigar import package resource_manager: fix gosigar import package Jul 6, 2023
@HuSharp HuSharp deleted the fix_gosigar branch July 26, 2023 02:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

resource_manage: fix gosigar import package
4 participants