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

scheduler: fix scheduler save config #7108

Merged
merged 6 commits into from
Sep 27, 2023
Merged

scheduler: fix scheduler save config #7108

merged 6 commits into from
Sep 27, 2023

Conversation

HuSharp
Copy link
Member

@HuSharp HuSharp commented Sep 18, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: Close #6897

What is changed and how does it work?

Nowadays we have 2 configs setting way
We need to make sure that create just means create and not further save the configuration

Check List

Tests

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

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 18, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • nolouch

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
Copy link
Contributor

ti-chi-bot bot commented Sep 18, 2023

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/needs-triage-completed 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 Sep 18, 2023
@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 18, 2023
@HuSharp HuSharp force-pushed the fix_scheduler_create branch 2 times, most recently from 143025b to 2a43640 Compare September 21, 2023 10:15
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 21, 2023
@ti-chi-bot ti-chi-bot bot added 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. and removed do-not-merge/needs-triage-completed labels Sep 21, 2023
@HuSharp HuSharp marked this pull request as ready for review September 21, 2023 10:23
@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 21, 2023
@HuSharp
fix
a5cdd29 
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 21, 2023
nolouch
nolouch approved these changes Sep 22, 2023
View reviewed changes
Copy link
Contributor

@nolouch nolouch left a comment

Choose a reason for hiding this comment

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

lgtm

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 22, 2023
@codecov
Copy link

codecov bot commented Sep 22, 2023 •
edited
Loading

Codecov Report

Merging #7108 (2cf30c1) into master (eb6953f) will increase coverage by 0.01%.
Report is 3 commits behind head on master.
The diff coverage is 73.07%.

@@            Coverage Diff             @@
##           master    #7108      +/-   ##
==========================================
+ Coverage   74.26%   74.28%   +0.01%     
==========================================
  Files         441      441              
  Lines       47216    47220       +4     
==========================================
+ Hits        35064    35076      +12     
+ Misses       9063     9044      -19     
- Partials     3089     3100      +11
Flag Coverage Δ
unittests 74.28% <73.07%> (+0.01%) ⬆️

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

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 26, 2023

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

Commit hash: 122f9f3

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 26, 2023
@ti-chi-bot ti-chi-bot bot merged commit 6752974 into tikv:master Sep 27, 2023
22 checks passed
@HuSharp HuSharp deleted the fix_scheduler_create branch September 27, 2023 09:04
@ti-chi-bot ti-chi-bot mentioned this pull request Sep 27, 2023
Merged
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 27, 2023
@HuSharp @ti-chi-bot
This is an automated cherry-pick of tikv#7108
73993c3 
close tikv#6897

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 Sep 27, 2023
@HuSharp @ti-chi-bot
This is an automated cherry-pick of tikv#7108
d7f9ded 
close tikv#6897

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Sep 27, 2023
Merged
@ti-chi-bot
Copy link
Member

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

@HuSharp HuSharp added needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. labels Sep 27, 2023
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

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

This was referenced Sep 27, 2023
Merged
Merged
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 27, 2023
@HuSharp @ti-chi-bot
This is an automated cherry-pick of tikv#7108
05bad3b 
close tikv#6897

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 Sep 27, 2023
@HuSharp @ti-chi-bot
This is an automated cherry-pick of tikv#7108
50ea6df 
close tikv#6897

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Sep 27, 2023
Closed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 27, 2023
@HuSharp @ti-chi-bot
This is an automated cherry-pick of tikv#7108
377342c 
close tikv#6897

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Sep 28, 2023
@ti-chi-bot @HuSharp
scheduler: fix scheduler save config (#7108) (#7161)
e063180 
close #6897

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

Co-authored-by: husharp <jinhao.hu@pingcap.com>
Co-authored-by: Hu# <jinhao.hu@pingcap.com>
ti-chi-bot bot added a commit that referenced this pull request Oct 7, 2023
@ti-chi-bot @HuSharp @ti-chi-bot
scheduler: fix scheduler save config (#7108) (#7162)
77d6f5b 
close #6897

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

Co-authored-by: husharp <jinhao.hu@pingcap.com>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot bot pushed a commit that referenced this pull request Oct 11, 2023
@ti-chi-bot @HuSharp
scheduler: fix scheduler save config (#7108) (#7164)
5cf2c43 
close #6897

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

Co-authored-by: husharp <jinhao.hu@pingcap.com>
rleungx pushed a commit to rleungx/pd that referenced this pull request Dec 1, 2023
@HuSharp @ti-chi-bot @rleungx
scheduler: fix scheduler save config (tikv#7108)
8a30bb1 
close tikv#6897

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

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot bot pushed a commit that referenced this pull request Sep 14, 2024
@ti-chi-bot @HuSharp
scheduler: fix scheduler save config (#7108) (#7165)
b7396e6 
close #6897

Signed-off-by: husharp <ihusharp@gmail.com>

Co-authored-by: husharp <ihusharp@gmail.com>
Co-authored-by: Hu# <ihusharp@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nolouch nolouch nolouch approved these changes

@JmPotato JmPotato JmPotato approved these changes

@rleungx rleungx Awaiting requested review from rleungx

@lhy1024 lhy1024 Awaiting requested review from lhy1024

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. 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. 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. 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.

evict-leader-scheduler lost config after PD leader transfer
4 participants
@HuSharp @JmPotato @ti-chi-bot @nolouch