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

scheduling: watch the respective scheduler config and trim the prefix #6955

Merged
merged 3 commits into from
Aug 15, 2023

Conversation

JmPotato
Copy link
Member

What problem does this PR solve?

Issue Number: ref #5839.

What is changed and how does it work?

- Make scheduling service watch the respective scheduler config.
- Trim the key prefix inside the watcher.

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

Signed-off-by: JmPotato <ghzpotato@gmail.com>
@JmPotato JmPotato added component/schedule Scheduling logic. component/config Configuration logic. component/scheduler Scheduler logic. labels Aug 14, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 14, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lhy1024
  • rleungx

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 bot added 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. labels Aug 14, 2023
@codecov
Copy link

codecov bot commented Aug 14, 2023

Codecov Report

Merging #6955 (5e6a088) into master (54981d1) will increase coverage by 0.14%.
The diff coverage is 94.87%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6955      +/-   ##
==========================================
+ Coverage   74.26%   74.40%   +0.14%     
==========================================
  Files         427      427              
  Lines       45270    45315      +45     
==========================================
+ Hits        33618    33718     +100     
+ Misses       8693     8640      -53     
+ Partials     2959     2957       -2     
Flag Coverage Δ
unittests 74.40% <94.87%> (+0.14%) ⬆️

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

@JmPotato JmPotato changed the title scheduling: watch the respective scheduler config scheduling: watch the respective scheduler config and trim the prefix Aug 14, 2023
Signed-off-by: JmPotato <ghzpotato@gmail.com>
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 14, 2023
@rleungx
Copy link
Member

rleungx commented Aug 14, 2023

Can the schedulers run normally now?

@JmPotato
Copy link
Member Author

Can the schedulers run normally now?

Currently Coordinator directly reads the scheduler config from the storage, so the sync results here can not be used. We may need to do some modifications after this PR to handle these cases:

  • Handle the compatibility with the old PD scheduling.
  • Determine the new path to store the scheduling-service-created config data.
  • Unify the way Coordinator fetches scheduler config whether from storage or watcher.

So currently I'd like to keep this PR to only implement the synchronization logic, WDYT?

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 15, 2023
@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 15, 2023
@rleungx
Copy link
Member

rleungx commented Aug 15, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 15, 2023

@rleungx: 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 15, 2023

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

Commit hash: 2f49527

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

ti-chi-bot bot commented Aug 15, 2023

@JmPotato: 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 602c10d into tikv:master Aug 15, 2023
23 checks passed
@JmPotato JmPotato deleted the sync_scheduler_conf branch August 15, 2023 04:31
mittalrishabh pushed a commit to mittalrishabh/pd that referenced this pull request Aug 18, 2023
…tikv#6955)

ref tikv#5839

- Make scheduling service watch the respective scheduler config.
- Trim the key prefix inside the watcher.

Signed-off-by: JmPotato <ghzpotato@gmail.com>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: rishabh_mittal <mittalrishabh@gmail.com>
rleungx pushed a commit to rleungx/pd that referenced this pull request Dec 1, 2023
…tikv#6955)

ref tikv#5839

- Make scheduling service watch the respective scheduler config.
- Trim the key prefix inside the watcher.

Signed-off-by: JmPotato <ghzpotato@gmail.com>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/config Configuration logic. component/schedule Scheduling logic. component/scheduler Scheduler logic. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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.

3 participants