This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
Backport Accounts Fixes #16838 and the test #17038 #19412
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Use ReclaimResult::Default() instead of building subtypes * Add test to ensure account_db store and index are aligned
Codecov Report
@@ Coverage Diff @@
## v1.6 #19412 +/- ##
=========================================
- Coverage 82.2% 82.2% -0.1%
=========================================
Files 423 423
Lines 118114 118146 +32
=========================================
+ Hits 97197 97222 +25
- Misses 20917 20924 +7 |
jeffwashington
approved these changes
Aug 25, 2021
|
I confirmed that this change, cherry-picked to 1.6 stops us accumulating old storages several million slots in the past. |
lijunwangs
reviewed
Aug 25, 2021
| @@ -1181,31 +1181,30 @@ impl AccountsDb { | |||
| // Reclaim older states of rooted accounts for AccountsDb bloat mitigation | |||
| fn clean_old_rooted_accounts( | |||
| &self, | |||
| purges_in_root: Vec<Pubkey>, | |||
| purges: Vec<Pubkey>, | |||
There was a problem hiding this comment.
These changes are just cosmetic, right? I can't find a logical difference. Is this PR truly for the test added?
There was a problem hiding this comment.
@lijunwangs see my comment to you below and this:
#16838
| @@ -1599,7 +1598,9 @@ impl AccountsDb { | |||
| // Don't reset from clean, since the pubkeys in those stores may need to be unref'ed | |||
| // and those stores may be used for background hashing. | |||
| let reset_accounts = false; | |||
| self.handle_reclaims(&reclaims, None, false, None, reset_accounts); | |||
| let mut reclaim_result = ReclaimResult::default(); | |||
| let reclaim_result = Some(&mut reclaim_result); | |||
There was a problem hiding this comment.
@lijunwangs this is the point of the change. We pass Some() into handle_reclaims.
The test is the other functional change.
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
See #16838. Fix was not backported to 1.6
Summary of Changes
Backport #16838 and #17038
Fixes #