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

scheduler: add aduit log for scheduler config API and add resp msg for evict-leader #7674

Merged
merged 5 commits into from
Jan 9, 2024

Conversation

CabinfeverB
Copy link
Member

What problem does this PR solve?

Issue Number: Close #7672

What is changed and how does it work?

Check List

Tests

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

[2024/01/08 11:20:31.719 +08:00] [INFO] [audit.go:126] ["audit log"] [service-info="{ServiceLabel:HandleSchedulerConfig, Method:HTTP/1.1/DELETE:/pd/api/v1/scheduler-config/evict-leader-scheduler/delete/2, CallerID:pd-ctl, IP:127.0.0.1 , Port:58671, StartTime:2024-01-08 11:20:31 +0800 CST, URLParam:{}, BodyParam:}"]
[2024/01/08 11:21:06.896 +08:00] [INFO] [audit.go:126] ["audit log"] [service-info="{ServiceLabel:HandleSchedulerConfig, Method:HTTP/1.1/POST:/pd/api/v1/scheduler-config/evict-leader-scheduler/config, CallerID:pd-ctl, IP:127.0.0.1, Po rt:58851, StartTime:2024-01-08 11:21:06 +0800 CST, URLParam:{}, BodyParam:{"name":"evict-leader-scheduler","store_id":2}}"]
Code changes

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

Release note

None.

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
Copy link
Contributor

ti-chi-bot bot commented Jan 8, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • nolouch
  • 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 needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. labels Jan 8, 2024
@ti-chi-bot ti-chi-bot bot requested review from HunDunDM and nolouch January 8, 2024 03:30
@ti-chi-bot ti-chi-bot bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 8, 2024
@CabinfeverB CabinfeverB requested review from JmPotato, rleungx and HuSharp and removed request for HunDunDM January 8, 2024 03:30
@CabinfeverB CabinfeverB changed the title scheduler: add aduit log for config API and add resp msg for evict-leader scheduler: add aduit log for scheduler config API and add resp msg for evict-leader Jan 8, 2024
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.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/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 8, 2024
@@ -151,7 +151,8 @@ func createRouter(prefix string, svr *server.Server) *mux.Router {
registerFunc(clusterRouter, "/schedulers/diagnostic/{name}", diagnosticHandler.GetDiagnosticResult, setMethods(http.MethodGet), setAuditBackend(prometheus))

schedulerConfigHandler := newSchedulerConfigHandler(svr, rd)
registerPrefix(apiRouter, "/scheduler-config", schedulerConfigHandler.GetSchedulerConfig, setAuditBackend(prometheus))
registerPrefix(apiRouter, "/scheduler-config", "HandleSchedulerConfig", schedulerConfigHandler.HandleSchedulerConfig, setMethods(http.MethodPost, http.MethodDelete, http.MethodPut, http.MethodPatch), setAuditBackend(localLog, prometheus))
Copy link
Member

Choose a reason for hiding this comment

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

How about SetSchedulerConfig?

Copy link
Member Author

Choose a reason for hiding this comment

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

It also includes the deletion method.

Copy link
Member

Choose a reason for hiding this comment

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

got

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 9, 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 Jan 9, 2024
@nolouch
Copy link
Contributor

nolouch commented Jan 9, 2024

/merge

Copy link
Contributor

ti-chi-bot bot commented Jan 9, 2024

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

Copy link
Contributor

ti-chi-bot bot commented Jan 9, 2024

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

Commit hash: bc10409

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 9, 2024
Copy link

codecov bot commented Jan 9, 2024

Codecov Report

Merging #7674 (b934f31) into master (dd8df25) will increase coverage by 0.10%.
The diff coverage is 66.66%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7674      +/-   ##
==========================================
+ Coverage   73.56%   73.66%   +0.10%     
==========================================
  Files         429      429              
  Lines       47434    47435       +1     
==========================================
+ Hits        34893    34944      +51     
+ Misses       9560     9519      -41     
+ Partials     2981     2972       -9     
Flag Coverage Δ
unittests 73.66% <66.66%> (+0.10%) ⬆️

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

@ti-chi-bot ti-chi-bot bot merged commit 8b8c78a into tikv:master Jan 9, 2024
23 of 26 checks passed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jan 9, 2024
close tikv#7672

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jan 9, 2024
close tikv#7672

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jan 9, 2024
close tikv#7672

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Jan 16, 2024
…r evict-leader (#7674) (#7686)

close #7672

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Co-authored-by: Yongbo Jiang <cabinfeveroier@gmail.com>
Co-authored-by: Cabinfever_B <cabinfeveroier@gmail.com>
ti-chi-bot bot added a commit that referenced this pull request Jan 16, 2024
…r evict-leader (#7674) (#7688)

close #7672

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Co-authored-by: Yongbo Jiang <cabinfeveroier@gmail.com>
Co-authored-by: Cabinfever_B <cabinfeveroier@gmail.com>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot bot added a commit that referenced this pull request Jan 16, 2024
…r evict-leader (#7674) (#7687)

close #7672

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Co-authored-by: Yongbo Jiang <cabinfeveroier@gmail.com>
Co-authored-by: Cabinfever_B <cabinfeveroier@gmail.com>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
pingandb pushed a commit to pingandb/pd that referenced this pull request Jan 18, 2024
…r evict-leader (tikv#7674)

close tikv#7672

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: pingandb <songge102@pingan.com.cn>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The output is null when adding evict-leader-scheduler for second store
4 participants