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

Jump to bottom

Retain executor cache counts (backport #22322) #22340

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Retain executor cache counts (backport #22322) #22340

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 29 additions & 17 deletions runtime/src/bank.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,37 +429,43 @@ impl CachedExecutors {
executors: HashMap::new(),
}
}

fn get(&self, pubkey: &Pubkey) -> Option<Arc<dyn Executor>> {
self.executors.get(pubkey).map(|entry| {
entry.epoch_count.fetch_add(1, Relaxed);
entry.executor.clone()
})
}

fn put(&mut self, pubkey: &Pubkey, executor: Arc<dyn Executor>) {
if !self.executors.contains_key(pubkey) && self.executors.len() >= self.max {
let mut least = u64::MAX;
let default_key = Pubkey::default();
let mut least_key = &default_key;

for (key, entry) in self.executors.iter() {
let count = entry.prev_epoch_count + entry.epoch_count.load(Relaxed);
if count < least {
least = count;
least_key = key;
let entry = if let Some(mut entry) = self.executors.remove(pubkey) {
entry.executor = executor;
entry
} else {
if self.executors.len() >= self.max {
let mut least = u64::MAX;
let default_key = Pubkey::default();
let mut least_key = &default_key;

for (key, entry) in self.executors.iter() {
let count = entry.prev_epoch_count + entry.epoch_count.load(Relaxed);
if count < least {
least = count;
least_key = key;
}
}
let least_key = *least_key;
let _ = self.executors.remove(&least_key);
}
let least_key = *least_key;
let _ = self.executors.remove(&least_key);
}
let _ = self.executors.insert(
*pubkey,
CachedExecutorsEntry {
prev_epoch_count: 0,
epoch_count: AtomicU64::new(0),
executor,
},
);
}
};
let _ = self.executors.insert(*pubkey, entry);
}

fn remove(&mut self, pubkey: &Pubkey) {
let _ = self.executors.remove(pubkey);
}
Expand Down Expand Up @@ -11917,6 +11923,11 @@ pub(crate) mod tests {
assert!(cache.get(&key4).is_some());
assert!(cache.get(&key3).is_none());

cache.put(&key1, executor.clone());
cache.put(&key3, executor.clone());
assert!(cache.get(&key1).is_some());
assert!(cache.get(&key4).is_none());

cache = cache.clone_with_epoch(2);
assert!(cache.current_epoch == 2);

Expand Down Expand Up @@ -11992,6 +12003,7 @@ pub(crate) mod tests {
assert!(executors.borrow().contains_key(&key3));
assert!(executors.borrow().contains_key(&key4));

// Remove all
bank.remove_executor(&key1);
bank.remove_executor(&key2);
bank.remove_executor(&key3);
Expand Down