blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

check for rewrites skipped in closure (#24330)

This commit is contained in:
Jeff Washington (jwash) 2022-04-14 13:46:18 -05:00 committed by GitHub
parent 2456a7be35
commit 0e7b0597db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/src/expected_rent_collection.rs
View File

@ -280,14 +280,18 @@ impl ExpectedRentCollection {
possibly_update = false; possibly_update = false;
} }
} // if more than 1 epoch old, then we need to collect rent because we clearly skipped it. } // if more than 1 epoch old, then we need to collect rent because we clearly skipped it.
let rewrites_skipped_this_pubkey_this_slot = || {
rewrites_skipped_this_slot
.read()
.unwrap()
.contains_key(pubkey)
};
let rent_epoch = account.rent_epoch(); let rent_epoch = account.rent_epoch();
if possibly_update if possibly_update
&& rent_epoch == 0 && rent_epoch == 0
&& current_epoch > 1 && current_epoch > 1
&& !rewrites_skipped_this_slot && !rewrites_skipped_this_pubkey_this_slot()
.read()
.unwrap()
.contains_key(pubkey)
{ {
// we know we're done // we know we're done
return None; return None;
@ -296,10 +300,8 @@ impl ExpectedRentCollection {
// if an account was written >= its rent collection slot within the last epoch worth of slots, then we don't want to update it here // if an account was written >= its rent collection slot within the last epoch worth of slots, then we don't want to update it here
if possibly_update && rent_epoch < current_epoch { if possibly_update && rent_epoch < current_epoch {
let new_rent_epoch = if partition_from_pubkey < partition_from_current_slot let new_rent_epoch = if partition_from_pubkey < partition_from_current_slot
|| rewrites_skipped_this_slot || (partition_from_pubkey == partition_from_current_slot
.read() && rewrites_skipped_this_pubkey_this_slot())
.unwrap()
.contains_key(pubkey)
{ {
// partition_from_pubkey < partition_from_current_slot: // partition_from_pubkey < partition_from_current_slot:
// we already would have done a rewrite on this account IN this epoch // we already would have done a rewrite on this account IN this epoch
@ -316,7 +318,7 @@ impl ExpectedRentCollection {
} }
} else if !possibly_update { } else if !possibly_update {
// This is a non-trivial lookup. Would be nice to skip this. // This is a non-trivial lookup. Would be nice to skip this.
assert!(!rewrites_skipped_this_slot.read().unwrap().contains_key(pubkey), "did not update rent_epoch: {}, new value for rent_epoch: {}, old: {}, current epoch: {}", pubkey, rent_epoch, next_epoch, current_epoch); assert!(!rewrites_skipped_this_pubkey_this_slot(), "did not update rent_epoch: {}, new value for rent_epoch: {}, old: {}, current epoch: {}", pubkey, rent_epoch, next_epoch, current_epoch);
} }
} }
None None