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

renaming/refactoring for append vecs (#29655)

This commit is contained in:
Jeff Washington (jwash) 2023-01-11 16:20:14 -06:00 committed by GitHub
parent 3d63f93bb0
commit 4b93fa85c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/src/accounts_db.rs
View File

@ -6898,7 +6898,7 @@ impl AccountsDb {
} }
} }
fn update_old_slot_stats(&self, stats: &HashStats, storage: Option<&Arc<AccountStorageEntry>>) { fn update_old_slot_stats(&self, stats: &HashStats, storage: Option<&SnapshotStorageOne>) {
if let Some(storage) = storage { if let Some(storage) = storage {
stats.roots_older_than_epoch.fetch_add(1, Ordering::Relaxed); stats.roots_older_than_epoch.fetch_add(1, Ordering::Relaxed);
let mut ancients = 0; let mut ancients = 0;
@ -6957,9 +6957,8 @@ impl AccountsDb {
storage: Option<&SnapshotStorageOne>, storage: Option<&SnapshotStorageOne>,
slot: Slot, slot: Slot,
) -> bool { ) -> bool {
if let Some(sub_storage) = storage { if let Some(append_vec) = storage {
// hash info about this storage // hash info about this storage
let append_vec = sub_storage;
append_vec.written_bytes().hash(hasher); append_vec.written_bytes().hash(hasher);
let storage_file = append_vec.accounts.get_path(); let storage_file = append_vec.accounts.get_path();
slot.hash(hasher); slot.hash(hasher);
@ -7119,14 +7118,14 @@ impl AccountsDb {
let acceptable_straggler_slot_count = 100; // do nothing special for these old stores which will likely get cleaned up shortly let acceptable_straggler_slot_count = 100; // do nothing special for these old stores which will likely get cleaned up shortly
let sub = slots_per_epoch + acceptable_straggler_slot_count; let sub = slots_per_epoch + acceptable_straggler_slot_count;
let in_epoch_range_start = max.saturating_sub(sub); let in_epoch_range_start = max.saturating_sub(sub);
for (slot, store) in storages.iter_range(&(..in_epoch_range_start)) { for (slot, storage) in storages.iter_range(&(..in_epoch_range_start)) {
if let Some(store) = store { if let Some(storage) = storage {
if !is_ancient(&store.accounts) { if !is_ancient(&storage.accounts) {
// ancient stores are managed separately - we expect them to be old and keeping accounts // ancient stores are managed separately - we expect them to be old and keeping accounts
// We can expect the normal processes will keep them cleaned. // We can expect the normal processes will keep them cleaned.
// If we included them here then ALL accounts in ALL ancient append vecs will be visited by clean each time. // If we included them here then ALL accounts in ALL ancient append vecs will be visited by clean each time.
self.dirty_stores self.dirty_stores
.insert((slot, store.append_vec_id()), store.clone()); .insert((slot, storage.append_vec_id()), storage.clone());
num_dirty_slots += 1; num_dirty_slots += 1;
} }
} }

8
runtime/src/snapshot_utils.rs
View File

@ -871,8 +871,12 @@ pub fn add_bank_snapshot(
let serde_style = match snapshot_version { let serde_style = match snapshot_version {
SnapshotVersion::V1_2_0 => SerdeStyle::Newer, SnapshotVersion::V1_2_0 => SerdeStyle::Newer,
}; };
let serialize = get_storages_to_serialize(snapshot_storages); bank_to_stream(
bank_to_stream(serde_style, stream.by_ref(), bank, &serialize)?; serde_style,
stream.by_ref(),
bank,
&get_storages_to_serialize(snapshot_storages),
)?;
Ok(()) Ok(())
}; };
let consumed_size = let consumed_size =