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

mcs, schedule: use txn in label rule manager #7738

Merged
merged 7 commits into from
Jan 22, 2024
Merged

Conversation

lhy1024
Copy link
Contributor

@lhy1024 lhy1024 commented Jan 19, 2024

What problem does this PR solve?

Issue Number: Ref #5839

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

Signed-off-by: lhy1024 <admin@liudos.us>
Copy link
Contributor

ti-chi-bot bot commented Jan 19, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • 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 do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels Jan 19, 2024
@ti-chi-bot ti-chi-bot bot requested review from disksing and Yisaer January 19, 2024 07:15
@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 19, 2024
Copy link

codecov bot commented Jan 19, 2024

Codecov Report

Merging #7738 (bd2e8bd) into master (fb6606a) will decrease coverage by 0.01%.
Report is 1 commits behind head on master.
The diff coverage is 69.76%.

❗ Current head bd2e8bd differs from pull request most recent head 7bddbc8. Consider uploading reports for the commit 7bddbc8 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7738      +/-   ##
==========================================
- Coverage   73.86%   73.85%   -0.01%     
==========================================
  Files         429      429              
  Lines       47591    47604      +13     
==========================================
+ Hits        35153    35159       +6     
+ Misses       9464     9462       -2     
- Partials     2974     2983       +9     
Flag Coverage Δ
unittests 73.85% <69.76%> (-0.01%) ⬇️

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

@@ -88,11 +89,10 @@ func (l *RegionLabeler) checkAndClearExpiredLabels() {
continue
}
if len(rule.Labels) == 0 {
err = l.storage.DeleteRegionRule(key)
delete(l.labelRules, key)
err = l.DeleteLabelRuleLocked(key)
deleted = true
Copy link
Member

Choose a reason for hiding this comment

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

If there is an error, deleted is still true?

deleted = true
} else {
err = l.storage.SaveRegionRule(key, rule)
err = l.SetLabelRuleLocked(rule)
Copy link
Member

Choose a reason for hiding this comment

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

I prefer not to change the unnecessary code, it does one more check and memory modification.

@@ -124,7 +124,7 @@ func (l *RegionLabeler) loadRules() error {
return err
}
for _, d := range toDelete {
if err = l.storage.DeleteRegionRule(d); err != nil {
if err = l.DeleteLabelRuleLocked(d); err != nil {
Copy link
Member

@rleungx rleungx Jan 19, 2024

Choose a reason for hiding this comment

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

ditto, previously, it didn't change the memory.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we should keep storage and memory consistent

Copy link
Member

@rleungx rleungx Jan 19, 2024

Choose a reason for hiding this comment

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

The rule won't be added into memory.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If the rule isn't added into memory, this pr will also not change it?

Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 19, 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 22, 2024
@lhy1024
Copy link
Contributor Author

lhy1024 commented Jan 22, 2024

/merge

Copy link
Contributor

ti-chi-bot bot commented Jan 22, 2024

@lhy1024: 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 22, 2024

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

Commit hash: bd2e8bd

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

ti-chi-bot bot commented Jan 22, 2024

@lhy1024: 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 6929c15 into tikv:master Jan 22, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

3 participants