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

remove random flushing of write cache (#23845)

This commit is contained in:
Jeff Washington (jwash) 2022-03-23 08:45:44 -05:00 committed by GitHub
parent 9859eb83b5
commit 493a8e2348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
runtime/src/accounts_db.rs
View File

@ -49,7 +49,7 @@ use {
DashMap, DashSet, DashMap, DashSet,
}, },
log::*, log::*,
rand::{prelude::SliceRandom, thread_rng, Rng}, rand::{thread_rng, Rng},
rayon::{prelude::*, ThreadPool}, rayon::{prelude::*, ThreadPool},
serde::{Deserialize, Serialize}, serde::{Deserialize, Serialize},
solana_measure::measure::Measure, solana_measure::measure::Measure,
@ -63,7 +63,6 @@ use {
pubkey::Pubkey, pubkey::Pubkey,
timing::AtomicInterval, timing::AtomicInterval,
}, },
solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY,
std::{ std::{
borrow::{Borrow, Cow}, borrow::{Borrow, Cow},
boxed::Box, boxed::Box,
@ -90,7 +89,6 @@ const STORE_META_OVERHEAD: usize = 256;
// when the accounts write cache exceeds this many bytes, we will flush it // when the accounts write cache exceeds this many bytes, we will flush it
// this can be specified on the command line, too (--accounts-db-cache-limit-mb) // this can be specified on the command line, too (--accounts-db-cache-limit-mb)
const WRITE_CACHE_LIMIT_BYTES_DEFAULT: u64 = 15_000_000_000; const WRITE_CACHE_LIMIT_BYTES_DEFAULT: u64 = 15_000_000_000;
const FLUSH_CACHE_RANDOM_THRESHOLD: usize = MAX_LOCKOUT_HISTORY;
const SCAN_SLOT_PAR_ITER_THRESHOLD: usize = 4000; const SCAN_SLOT_PAR_ITER_THRESHOLD: usize = 4000;
pub const DEFAULT_FILE_SIZE: u64 = PAGE_SIZE * 1024; pub const DEFAULT_FILE_SIZE: u64 = PAGE_SIZE * 1024;
@ -4683,26 +4681,6 @@ impl AccountsDb {
("account_bytes_saved", account_bytes_saved, i64), ("account_bytes_saved", account_bytes_saved, i64),
("num_accounts_saved", num_accounts_saved, i64), ("num_accounts_saved", num_accounts_saved, i64),
); );
// Flush a random slot out after every force flush to catch any inconsistencies
// between cache and written state (i.e. should cause a hash mismatch between validators
// that flush and don't flush if such a bug exists).
let num_slots_remaining = self.accounts_cache.num_slots();
if force_flush && num_slots_remaining >= FLUSH_CACHE_RANDOM_THRESHOLD {
// Don't flush slots that are known to be unrooted
let mut frozen_slots = self.accounts_cache.cached_frozen_slots();
frozen_slots.retain(|s| *s > max_flushed_root);
// Remove a random index 0 <= i < `frozen_slots.len()`
let rand_slot = frozen_slots.choose(&mut thread_rng());
if let Some(rand_slot) = rand_slot {
let random_flush_stats =
self.flush_slot_cache(*rand_slot, None::<&mut fn(&_, &_) -> bool>);
info!(
"Flushed random slot: num_remaining: {} {:?}",
num_slots_remaining, random_flush_stats,
);
}
}
} }
fn flush_rooted_accounts_cache( fn flush_rooted_accounts_cache(
@ -7537,7 +7515,7 @@ pub mod tests {
inline_spl_token, inline_spl_token,
}, },
assert_matches::assert_matches, assert_matches::assert_matches,
rand::{thread_rng, Rng}, rand::{prelude::SliceRandom, thread_rng, Rng},
solana_sdk::{ solana_sdk::{
account::{ account::{
accounts_equal, Account, AccountSharedData, ReadableAccount, WritableAccount, accounts_equal, Account, AccountSharedData, ReadableAccount, WritableAccount,