gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add jitter to cleanup to prevent all nodes cleaning at the same time (#10936)

Browse Source
This commit is contained in:
sakridge
2020-07-10 11:54:45 -07:00
committed by GitHub
parent 1f5070e569
commit 631f051c68
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/accounts_background_service.rs
View File

@ -2,6 +2,7 @@
// //
// This can be expensive since we have to walk the append vecs being cleaned up. // This can be expensive since we have to walk the append vecs being cleaned up.
use rand::{thread_rng, Rng};
use solana_runtime::bank_forks::BankForks; use solana_runtime::bank_forks::BankForks;
use std::sync::{ use std::sync::{
atomic::{AtomicBool, Ordering}, atomic::{AtomicBool, Ordering},
@ -39,7 +40,9 @@ impl AccountsBackgroundService {
consumed_budget = bank consumed_budget = bank
.process_stale_slot_with_budget(consumed_budget, SHRUNKEN_ACCOUNT_PER_INTERVAL); .process_stale_slot_with_budget(consumed_budget, SHRUNKEN_ACCOUNT_PER_INTERVAL);
if bank.block_height() - last_cleaned_slot > CLEAN_INTERVAL_SLOTS { if bank.block_height() - last_cleaned_slot
> (CLEAN_INTERVAL_SLOTS + thread_rng().gen_range(0, 10))
{
bank.clean_accounts(); bank.clean_accounts();
last_cleaned_slot = bank.block_height(); last_cleaned_slot = bank.block_height();
} }

4
runtime/src/accounts_db.rs
View File

@ -721,7 +721,7 @@ impl AccountsDB {
let mut reclaims_time = Measure::start("reclaims"); let mut reclaims_time = Measure::start("reclaims");
// Recalculate reclaims with new purge set // Recalculate reclaims with new purge set
let purges_key_to_slot_set: Vec<_> = purges let pubkey_to_slot_set: Vec<_> = purges
.into_iter() .into_iter()
.map(|(key, (slots_list, _ref_count))| { .map(|(key, (slots_list, _ref_count))| {
( (
@ -733,7 +733,7 @@ impl AccountsDB {
let accounts_index = self.accounts_index.read().unwrap(); let accounts_index = self.accounts_index.read().unwrap();
let mut reclaims = Vec::new(); let mut reclaims = Vec::new();
let mut dead_keys = Vec::new(); let mut dead_keys = Vec::new();
for (pubkey, slots_set) in purges_key_to_slot_set { for (pubkey, slots_set) in pubkey_to_slot_set {
let (new_reclaims, is_empty) = accounts_index.purge_exact(&pubkey, slots_set); let (new_reclaims, is_empty) = accounts_index.purge_exact(&pubkey, slots_set);
if is_empty { if is_empty {
dead_keys.push(pubkey); dead_keys.push(pubkey);