-
Notifications
You must be signed in to change notification settings - Fork 721
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
Conversation
Signed-off-by: lhy1024 <admin@liudos.us>
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
Codecov Report
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
Flags with carried forward coverage won't be shown. Click here to find out more. |
pkg/schedule/labeler/labeler.go
Outdated
@@ -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 |
There was a problem hiding this comment.
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?
pkg/schedule/labeler/labeler.go
Outdated
deleted = true | ||
} else { | ||
err = l.storage.SaveRegionRule(key, rule) | ||
err = l.SetLabelRuleLocked(rule) |
There was a problem hiding this comment.
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.
pkg/schedule/labeler/labeler.go
Outdated
@@ -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 { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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>
/merge |
@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
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. |
This pull request has been accepted and is ready to merge. Commit hash: bd2e8bd
|
@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. |
What problem does this PR solve?
Issue Number: Ref #5839
What is changed and how does it work?
Check List
Tests
Release note