Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track RecycleStore basic stats with needed refactor (bp #15291) #15327

Merged
merged 1 commit into from
Feb 15, 2021
Merged

Track RecycleStore basic stats with needed refactor (bp #15291) #15327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 63 additions & 15 deletions runtime/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,43 @@ pub struct StoreAccountsTiming {
update_index_elapsed: u64,
handle_reclaims_elapsed: u64,
}

#[derive(Debug, Default)]
struct RecycleStores {
entries: Vec<Arc<AccountStorageEntry>>,
total_bytes: u64,
}

impl RecycleStores {
fn add_entry(&mut self, new_entry: Arc<AccountStorageEntry>) {
self.total_bytes += new_entry.total_bytes();
self.entries.push(new_entry)
}

fn iter(&self) -> std::slice::Iter<Arc<AccountStorageEntry>> {
self.entries.iter()
}

fn add_entries(&mut self, new_entries: Vec<Arc<AccountStorageEntry>>) {
self.total_bytes += new_entries.iter().map(|e| e.total_bytes()).sum::<u64>();
self.entries.extend(new_entries);
}

fn remove_entry(&mut self, index: usize) -> Arc<AccountStorageEntry> {
let removed_entry = self.entries.swap_remove(index);
self.total_bytes -= removed_entry.total_bytes();
removed_entry
}

fn entry_count(&self) -> usize {
self.entries.len()
}

fn total_bytes(&self) -> u64 {
self.total_bytes
}
}

// This structure handles the load/store of the accounts
#[derive(Debug)]
pub struct AccountsDB {
Expand All @@ -650,7 +687,7 @@ pub struct AccountsDB {

pub accounts_cache: AccountsCache,

recycle_stores: RwLock<Vec<Arc<AccountStorageEntry>>>,
recycle_stores: RwLock<RecycleStores>,

/// distribute the accounts across storage lists
pub next_id: AtomicUsize,
Expand Down Expand Up @@ -1018,7 +1055,7 @@ impl Default for AccountsDB {
accounts_index: AccountsIndex::default(),
storage: AccountStorage::default(),
accounts_cache: AccountsCache::default(),
recycle_stores: RwLock::new(Vec::new()),
recycle_stores: RwLock::new(RecycleStores::default()),
uncleaned_pubkeys: DashMap::new(),
next_id: AtomicUsize::new(0),
shrink_candidate_slots_v1: Mutex::new(Vec::new()),
Expand Down Expand Up @@ -1837,13 +1874,13 @@ impl AccountsDB {
recycle_stores_write_elapsed.stop();

let mut drop_storage_entries_elapsed = Measure::start("drop_storage_entries_elapsed");
if recycle_stores.len() < MAX_RECYCLE_STORES {
recycle_stores.extend(dead_storages);
if recycle_stores.entry_count() < MAX_RECYCLE_STORES {
recycle_stores.add_entries(dead_storages);
drop(recycle_stores);
} else {
self.stats
.dropped_stores
.fetch_add(recycle_stores.len() as u64, Ordering::Relaxed);
.fetch_add(dead_storages.len() as u64, Ordering::Relaxed);
drop(recycle_stores);
drop(dead_storages);
}
Expand Down Expand Up @@ -2258,7 +2295,7 @@ impl AccountsDB {
avail += 1;

if store.accounts.capacity() >= min_size && store.accounts.capacity() < max_size {
let ret = recycle_stores.swap_remove(i);
let ret = recycle_stores.remove_entry(i);
drop(recycle_stores);
let old_id = ret.append_vec_id();
ret.recycle(slot, self.next_id.fetch_add(1, Ordering::Relaxed));
Expand All @@ -2276,7 +2313,7 @@ impl AccountsDB {
"no recycle stores max: {} min: {} len: {} looking: {}, {} avail: {}",
max,
min,
recycle_stores.len(),
recycle_stores.entry_count(),
min_size,
max_size,
avail,
Expand Down Expand Up @@ -2479,14 +2516,14 @@ impl AccountsDB {
for slot_entries in slot_stores {
let entry = slot_entries.read().unwrap();
for (_store_id, stores) in entry.iter() {
if recycle_stores.len() > MAX_RECYCLE_STORES {
if recycle_stores.entry_count() > MAX_RECYCLE_STORES {
let dropped_count = total_removed_storage_entries - recycled_count;
self.stats
.dropped_stores
.fetch_add(dropped_count as u64, Ordering::Relaxed);
return recycle_stores_write_elapsed.as_us();
}
recycle_stores.push(stores.clone());
recycle_stores.add_entry(stores.clone());
recycled_count += 1;
}
}
Expand Down Expand Up @@ -3350,7 +3387,7 @@ impl AccountsDB {
("total_count", total_count, i64),
(
"recycle_count",
self.recycle_stores.read().unwrap().len() as u64,
self.recycle_stores.read().unwrap().entry_count() as u64,
i64
),
);
Expand Down Expand Up @@ -4311,13 +4348,24 @@ impl AccountsDB {
),
);

let recycle_stores = self.recycle_stores.read().unwrap();
datapoint_info!(
"accounts_db_store_timings2",
(
"recycle_store_count",
self.stats.recycle_store_count.swap(0, Ordering::Relaxed),
i64
),
(
"current_recycle_store_count",
recycle_stores.entry_count(),
i64
),
(
"current_recycle_store_bytes",
recycle_stores.total_bytes(),
i64
),
(
"create_store_count",
self.stats.create_store_count.swap(0, Ordering::Relaxed),
Expand Down Expand Up @@ -4906,13 +4954,13 @@ impl AccountsDB {
recycle_stores_write_elapsed.stop();

let mut drop_storage_entries_elapsed = Measure::start("drop_storage_entries_elapsed");
if recycle_stores.len() < MAX_RECYCLE_STORES {
recycle_stores.extend(dead_storages);
if recycle_stores.entry_count() < MAX_RECYCLE_STORES {
recycle_stores.add_entries(dead_storages);
drop(recycle_stores);
} else {
self.stats
.dropped_stores
.fetch_add(recycle_stores.len() as u64, Ordering::Relaxed);
.fetch_add(dead_storages.len() as u64, Ordering::Relaxed);
drop(recycle_stores);
drop(dead_storages);
}
Expand Down Expand Up @@ -8248,7 +8296,7 @@ pub mod tests {
accounts.clean_accounts(None);
accounts.shrink_all_slots();
accounts.print_accounts_stats("post-shrink");
let num_stores = accounts.recycle_stores.read().unwrap().len();
let num_stores = accounts.recycle_stores.read().unwrap().entry_count();
assert!(num_stores > 0);

let mut account_refs = Vec::new();
Expand All @@ -8262,7 +8310,7 @@ pub mod tests {
accounts.store_uncached(2, &[(key, &account)]);
account_refs.push(account);
}
assert!(accounts.recycle_stores.read().unwrap().len() < num_stores);
assert!(accounts.recycle_stores.read().unwrap().entry_count() < num_stores);

accounts.print_accounts_stats("post-store");

Expand Down