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.

Sign up for GitHub

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

Jump to bottom

mcs: fix micro-service topo's display #7956

Merged
merged 2 commits into from
Mar 21, 2024
Merged

mcs: fix micro-service topo's display #7956

merged 2 commits into from
Mar 21, 2024

Conversation

HuSharp
Copy link
Member

@HuSharp HuSharp commented Mar 21, 2024 •
edited
Loading

What problem does this PR solve?

Issue Number: Close #7957

What is changed and how does it work?

before
img_v3_0296_67eef215-0035-4a4f-b929-7b3b050e555g
after
image

Check List

Tests

  • Manual test (add detailed scripts or steps below)

Release note

None.

@HuSharp
fix deploy path
eb9d2cb 
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2024 •
edited
Loading

[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.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. labels Mar 21, 2024
@ti-chi-bot ti-chi-bot bot requested review from JmPotato and lhy1024 March 21, 2024 06:42
@HuSharp HuSharp marked this pull request as ready for review March 21, 2024 06:42
@ti-chi-bot ti-chi-bot bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Mar 21, 2024
lhy1024
lhy1024 reviewed Mar 21, 2024
View reviewed changes
pkg/mcs/scheduling/server/server.go
@@ -413,7 +414,8 @@ func (s *Server) startServer() (err error) {
// different service modes provided by the same pd-server binary
bs.ServerInfoGauge.WithLabelValues(versioninfo.PDReleaseVersion, versioninfo.PDGitHash).Set(float64(time.Now().Unix()))
bs.ServerMaxProcsGauge.Set(float64(runtime.GOMAXPROCS(0)))
deployPath, err := os.Executable()
execPath, err := os.Executable()
Copy link
Contributor

Choose a reason for hiding this comment

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

tso and resource manager also need to update

Copy link
Member Author

Choose a reason for hiding this comment

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

get it. only tso and scheduling have it

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 also need to pick it to release-8.0?

Copy link
Member Author

Choose a reason for hiding this comment

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

added

@HuSharp
fix deploy path
d3e9e7f 
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 21, 2024
@HuSharp
Copy link
Member Author

HuSharp commented Mar 21, 2024

/check-issue-triage-complete

@HuSharp HuSharp changed the title mcs: fix deploy path mcs: fix micro-service topo's display Mar 21, 2024
@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 Mar 21, 2024
@codecov Codecov
Copy link

codecov bot commented Mar 21, 2024 •
edited
Loading

Codecov Report

Merging #7956 (d3e9e7f) into master (bb8ba31) will decrease coverage by 0.04%.
Report is 1 commits behind head on master.
The diff coverage is 100.00%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7956      +/-   ##
==========================================
- Coverage   73.55%   73.51%   -0.04%     
==========================================
  Files         436      436              
  Lines       48374    48376       +2     
==========================================
- Hits        35581    35566      -15     
- Misses       9741     9753      +12     
- Partials     3052     3057       +5
Flag Coverage Δ
unittests 73.51% <100.00%> (-0.04%) ⬇️

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

@HuSharp
Copy link
Member Author

HuSharp commented Mar 21, 2024

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 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.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Mar 21, 2024

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

Commit hash: d3e9e7f

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 21, 2024
@ti-chi-bot ti-chi-bot bot merged commit 7ec0058 into tikv:master Mar 21, 2024
25 of 26 checks passed
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-8.0 The PR needs to cherry pick to release-8.0 branch. label Mar 21, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 21, 2024
Merged
@ti-chi-bot
Copy link
Member

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

@HuSharp HuSharp deleted the fix_deploy_path branch March 21, 2024 07:03
ti-chi-bot bot pushed a commit that referenced this pull request Mar 21, 2024
@ti-chi-bot @HuSharp
mcs: fix micro-service topo's display (#7956) (#7958)
92a303c 
close #7957

Signed-off-by: husharp <jinhao.hu@pingcap.com>

Co-authored-by: husharp <jinhao.hu@pingcap.com>
@HuSharp HuSharp mentioned this pull request Mar 21, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@CabinfeverB CabinfeverB CabinfeverB approved these changes

@JmPotato JmPotato Awaiting requested review from JmPotato

Assignees
No one assigned
Labels
needs-cherry-pick-release-8.0 The PR needs to cherry pick to release-8.0 branch. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

mcs: micro-service topo's display is wrong
4 participants
@HuSharp @ti-chi-bot @lhy1024 @CabinfeverB