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

AcctIdx: startup causes us to flush remove everything asap (#20121)

This commit is contained in:
Jeff Washington (jwash) 2021-09-23 12:17:52 -05:00 committed by GitHub
parent 5dae615208
commit fe28f17718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/src/in_mem_accounts_index.rs
View File

@ -588,8 +588,10 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
let was_dirty = self.bin_dirty.swap(false, Ordering::Acquire); let was_dirty = self.bin_dirty.swap(false, Ordering::Acquire);
let current_age = self.storage.current_age(); let current_age = self.storage.current_age();
let mut iterate_for_age = self.get_should_age(current_age); let mut iterate_for_age = self.get_should_age(current_age);
if !was_dirty && !iterate_for_age { let startup = self.storage.get_startup();
if !was_dirty && !iterate_for_age && !startup {
// wasn't dirty and no need to age, so no need to flush this bucket // wasn't dirty and no need to age, so no need to flush this bucket
// but, at startup we want to remove from buckets as fast as possible if any items exist
return; return;
} }
@ -613,7 +615,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
updates.push((*k, Arc::clone(v))); updates.push((*k, Arc::clone(v)));
} }
if self.should_remove_from_mem(current_age, v) { if startup || self.should_remove_from_mem(current_age, v) {
removes.push(*k); removes.push(*k);
} }
} }
@ -638,7 +640,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
); );
let m = Measure::start("flush_remove"); let m = Measure::start("flush_remove");
if !self.flush_remove_from_cache(removes, current_age) { if !self.flush_remove_from_cache(removes, current_age, startup) {
iterate_for_age = false; // did not make it all the way through this bucket, so didn't handle age completely iterate_for_age = false; // did not make it all the way through this bucket, so didn't handle age completely
} }
Self::update_time_stat(&self.stats().flush_remove_us, m); Self::update_time_stat(&self.stats().flush_remove_us, m);
@ -652,7 +654,12 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
// remove keys in 'removes' from in-mem cache due to age // remove keys in 'removes' from in-mem cache due to age
// return true if the removal was completed // return true if the removal was completed
fn flush_remove_from_cache(&self, removes: Vec<Pubkey>, current_age: Age) -> bool { fn flush_remove_from_cache(
&self,
removes: Vec<Pubkey>,
current_age: Age,
startup: bool,
) -> bool {
let mut completed_scan = true; let mut completed_scan = true;
if removes.is_empty() { if removes.is_empty() {
return completed_scan; // completed, don't need to get lock or do other work return completed_scan; // completed, don't need to get lock or do other work
@ -672,9 +679,10 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
continue; continue;
} }
if v.dirty() || !self.should_remove_from_mem(current_age, v) { if v.dirty() || (!startup && !self.should_remove_from_mem(current_age, v)) {
// marked dirty or bumped in age after we looked above // marked dirty or bumped in age after we looked above
// these will be handled in later passes // these will be handled in later passes
// but, at startup, everything is ready to age out if it isn't dirty
continue; continue;
} }