Skip to content

*: Revert resource manager micro service code#9738

Merged
ti-chi-bot[bot] merged 5 commits intotikv:masterfrom
okJiang:revert-rm-ms
Sep 28, 2025
Merged

*: Revert resource manager micro service code#9738
ti-chi-bot[bot] merged 5 commits intotikv:masterfrom
okJiang:revert-rm-ms

Conversation

@okJiang
Copy link
Copy Markdown
Member

@okJiang okJiang commented Sep 15, 2025 •
edited
Loading

What problem does this PR solve?

Issue Number: Ref #9737

What is changed and how does it work?

  1. revert related code, ref mcs: remove resource manager service #8804
  2. adopt metering

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

@okJiang
Revert "mcs: remove resource manager service (tikv#8804)"
b7eec4c 
This reverts commit 9415fdc.

Signed-off-by: okjiang <819421878@qq.com>
@okJiang
adopt metering
995ea3f 
Signed-off-by: okjiang <819421878@qq.com>
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Sep 15, 2025
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Sep 15, 2025

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 dco-signoff: yes Indicates the PR's author has signed the dco. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 15, 2025
@okJiang
fix unit test
4525aeb 
Signed-off-by: okjiang <819421878@qq.com>
@okJiang okJiang marked this pull request as ready for review September 15, 2025 08:49
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 15, 2025
@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Sep 15, 2025

/cc @rleungx @JmPotato

@ti-chi-bot ti-chi-bot bot requested review from JmPotato and rleungx September 15, 2025 08:52
@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Sep 15, 2025

/retest

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 15, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 54.17957% with 148 lines in your changes missing coverage. Please review.
✅ Project coverage is 76.80%. Comparing base (1ac8d8c) to head (5209d5b).
⚠️ Report is 5 commits behind head on master.

❌ Your patch status has failed because the patch coverage (54.17%) is below the target coverage (74.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #9738      +/-   ##
==========================================
- Coverage   76.80%   76.80%   -0.01%     
==========================================
  Files         486      488       +2     
  Lines       77396    77889     +493     
==========================================
+ Hits        59444    59821     +377     
- Misses      14321    14422     +101     
- Partials     3631     3646      +15
Flag Coverage Δ
unittests 76.80% <54.17%> (-0.01%) ⬇️

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 19, 2025
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 24, 2025
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Sep 24, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-09-19 03:03:01.792464817 +0000 UTC m=+155343.271045484: ☑️ agreed by rleungx.
  • 2025-09-24 10:28:42.590791013 +0000 UTC m=+438932.661284696: ☑️ agreed by JmPotato.

@okJiang
Merge branch 'master' of github.com:tikv/pd into revert-rm-ms
ac266c8 
Signed-off-by: okjiang <819421878@qq.com>
rleungx
rleungx reviewed Sep 25, 2025
View reviewed changes
cmd/pd-server/main.go Outdated
cmd := &cobra.Command{
Use: "services <mode>",
Short: "Run services, for example, tso, resource_manager",
Short: "Run services, for example, tso, scheduling, router, resource_manager",
Copy link
Copy Markdown
Member

@rleungx rleungx Sep 25, 2025

Choose a reason for hiding this comment

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

Suggested change
Short: "Run services, for example, tso, scheduling, router, resource_manager",
Short: "Run services, for example, tso, scheduling, router, resource-manager",

@okJiang
fix: correct spelling of 'resource-manager' in service command descri…
5209d5b 
…ption

Signed-off-by: okjiang <819421878@qq.com>
@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Sep 26, 2025

/retest

@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Sep 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JmPotato, niubell, rleungx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Sep 28, 2025
@ti-chi-bot ti-chi-bot bot merged commit e86b044 into tikv:master Sep 28, 2025
36 of 40 checks passed
@okJiang okJiang deleted the revert-rm-ms branch September 28, 2025 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rleungx rleungx rleungx approved these changes

@JmPotato JmPotato JmPotato approved these changes

+1 more reviewer

@niubell niubell niubell approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@okJiang @JmPotato @niubell @rleungx
⚡