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

use slot instead of store_id in clean (#30472) 

* use slot instead of store_id in clean

* update debug
This commit is contained in:
Jeff Washington (jwash) 2023-02-24 14:01:16 -06:00 committed by GitHub
parent 9080b36192
commit 31573beb2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
runtime/src/accounts_db.rs
View File

@ -2768,7 +2768,7 @@ impl AccountsDb {
/// 2. a pubkey we were planning to remove is not removing all stores that contain the account /// 2. a pubkey we were planning to remove is not removing all stores that contain the account
fn calc_delete_dependencies( fn calc_delete_dependencies(
purges: &HashMap<Pubkey, (SlotList<AccountInfo>, RefCount)>, purges: &HashMap<Pubkey, (SlotList<AccountInfo>, RefCount)>,
store_counts: &mut HashMap<AppendVecId, (usize, HashSet<Pubkey>)>, store_counts: &mut HashMap<Slot, (usize, HashSet<Pubkey>)>,
min_slot: Option<Slot>, min_slot: Option<Slot>,
) { ) {
// Another pass to check if there are some filtered accounts which // Another pass to check if there are some filtered accounts which
@ -2781,14 +2781,12 @@ impl AccountsDb {
account_infos.len() as RefCount == *ref_count_from_storage; account_infos.len() as RefCount == *ref_count_from_storage;
if all_stores_being_deleted { if all_stores_being_deleted {
let mut delete = true; let mut delete = true;
for (slot, account_info) in account_infos { for (slot, _account_info) in account_infos {
let store_id = account_info.store_id(); if let Some(count) = store_counts.get(slot).map(|s| s.0) {
if let Some(count) = store_counts.get(&store_id).map(|s| s.0) {
debug!( debug!(
"calc_delete_dependencies() "calc_delete_dependencies()
storage id: {}, slot: {slot},
count len: {}", count len: {count}"
store_id, count,
); );
if count == 0 { if count == 0 {
// this store CAN be removed // this store CAN be removed
@ -2821,34 +2819,34 @@ impl AccountsDb {
} }
// increment store_counts to non-zero for all stores that can not be deleted. // increment store_counts to non-zero for all stores that can not be deleted.
let mut pending_store_ids = HashSet::new(); let mut pending_stores = HashSet::new();
for (slot, account_info) in account_infos { for (slot, _account_info) in account_infos {
if !already_counted.contains(slot) { if !already_counted.contains(slot) {
pending_store_ids.insert((*slot, account_info.store_id())); pending_stores.insert(*slot);
} }
} }
while !pending_store_ids.is_empty() { while !pending_stores.is_empty() {
let (slot, id) = pending_store_ids.iter().next().cloned().unwrap(); let slot = pending_stores.iter().next().cloned().unwrap();
if Some(slot) == min_slot { if Some(slot) == min_slot {
if let Some(failed_slot) = failed_slot.take() { if let Some(failed_slot) = failed_slot.take() {
info!("calc_delete_dependencies, oldest store is not able to be deleted because of {pubkey} in slot {failed_slot}"); info!("calc_delete_dependencies, oldest slot is not able to be deleted because of {pubkey} in slot {failed_slot}");
} else { } else {
info!("calc_delete_dependencies, oldest store is not able to be deleted because of {pubkey}, account infos len: {}, ref count: {ref_count_from_storage}", account_infos.len()); info!("calc_delete_dependencies, oldest slot is not able to be deleted because of {pubkey}, account infos len: {}, ref count: {ref_count_from_storage}", account_infos.len());
} }
} }
pending_store_ids.remove(&(slot, id)); pending_stores.remove(&slot);
if !already_counted.insert(slot) { if !already_counted.insert(slot) {
continue; continue;
} }
// the point of all this code: remove the store count for all stores we cannot remove // the point of all this code: remove the store count for all stores we cannot remove
if let Some(store_count) = store_counts.remove(&id) { if let Some(store_count) = store_counts.remove(&slot) {
// all pubkeys in this store also cannot be removed from all stores they are in // all pubkeys in this store also cannot be removed from all stores they are in
let affected_pubkeys = &store_count.1; let affected_pubkeys = &store_count.1;
for key in affected_pubkeys { for key in affected_pubkeys {
for (slot, account_info) in &purges.get(key).unwrap().0 { for (slot, _account_info) in &purges.get(key).unwrap().0 {
if !already_counted.contains(slot) { if !already_counted.contains(slot) {
pending_store_ids.insert((*slot, account_info.store_id())); pending_stores.insert(*slot);
} }
} }
} }
@ -3353,7 +3351,7 @@ impl AccountsDb {
// Calculate store counts as if everything was purged // Calculate store counts as if everything was purged
// Then purge if we can // Then purge if we can
let mut store_counts: HashMap<AppendVecId, (usize, HashSet<Pubkey>)> = HashMap::new(); let mut store_counts: HashMap<Slot, (usize, HashSet<Pubkey>)> = HashMap::new();
for (key, (account_infos, ref_count)) in purges_zero_lamports.iter_mut() { for (key, (account_infos, ref_count)) in purges_zero_lamports.iter_mut() {
if purged_account_slots.contains_key(key) { if purged_account_slots.contains_key(key) {
*ref_count = self.accounts_index.ref_count_from_storage(key); *ref_count = self.accounts_index.ref_count_from_storage(key);
@ -3377,7 +3375,7 @@ impl AccountsDb {
if was_reclaimed { if was_reclaimed {
return false; return false;
} }
if let Some(store_count) = store_counts.get_mut(&account_info.store_id()) { if let Some(store_count) = store_counts.get_mut(slot) {
store_count.0 -= 1; store_count.0 -= 1;
store_count.1.insert(*key); store_count.1.insert(*key);
} else { } else {
@ -3399,7 +3397,7 @@ impl AccountsDb {
"store_counts, inserting slot: {}, store id: {}, count: {}", "store_counts, inserting slot: {}, store id: {}, count: {}",
slot, account_info.store_id(), count slot, account_info.store_id(), count
); );
store_counts.insert(account_info.store_id(), (count, key_set)); store_counts.insert(*slot, (count, key_set));
} }
true true
}); });
@ -3686,7 +3684,7 @@ impl AccountsDb {
&self, &self,
max_clean_root_inclusive: Option<Slot>, max_clean_root_inclusive: Option<Slot>,
last_full_snapshot_slot: Option<Slot>, last_full_snapshot_slot: Option<Slot>,
store_counts: &HashMap<AppendVecId, (usize, HashSet<Pubkey>)>, store_counts: &HashMap<Slot, (usize, HashSet<Pubkey>)>,
purges_zero_lamports: &mut HashMap<Pubkey, (SlotList<AccountInfo>, RefCount)>, purges_zero_lamports: &mut HashMap<Pubkey, (SlotList<AccountInfo>, RefCount)>,
) { ) {
let should_filter_for_incremental_snapshots = max_clean_root_inclusive.unwrap_or(Slot::MAX) let should_filter_for_incremental_snapshots = max_clean_root_inclusive.unwrap_or(Slot::MAX)
@ -3699,8 +3697,8 @@ impl AccountsDb {
purges_zero_lamports.retain(|pubkey, (slot_account_infos, _ref_count)| { purges_zero_lamports.retain(|pubkey, (slot_account_infos, _ref_count)| {
// Only keep purges_zero_lamports where the entire history of the account in the root set // Only keep purges_zero_lamports where the entire history of the account in the root set
// can be purged. All AppendVecs for those updates are dead. // can be purged. All AppendVecs for those updates are dead.
for (_slot, account_info) in slot_account_infos.iter() { for (slot, _account_info) in slot_account_infos.iter() {
if let Some(store_count) = store_counts.get(&account_info.store_id()) { if let Some(store_count) = store_counts.get(slot) {
if store_count.0 != 0 { if store_count.0 != 0 {
// one store this pubkey is in is not being removed, so this pubkey cannot be removed at all // one store this pubkey is in is not being removed, so this pubkey cannot be removed at all
return false; return false;
@ -16062,7 +16060,7 @@ pub mod tests {
key_set.insert(pubkey); key_set.insert(pubkey);
let store_count = 0; let store_count = 0;
let mut store_counts = HashMap::default(); let mut store_counts = HashMap::default();
store_counts.insert(account_info.store_id(), (store_count, key_set)); store_counts.insert(slot, (store_count, key_set));
let mut purges_zero_lamports = HashMap::default(); let mut purges_zero_lamports = HashMap::default();
purges_zero_lamports.insert(pubkey, (vec![(slot, account_info)], 1)); purges_zero_lamports.insert(pubkey, (vec![(slot, account_info)], 1));