Store missing unupdated executors earlier
This commit is contained in:
parent
740ee0c502
commit
387d9d9c77
|
@ -77,13 +77,23 @@ pub trait Executor: Debug + Send + Sync {
|
||||||
|
|
||||||
pub type Executors = HashMap<Pubkey, TransactionExecutor>;
|
pub type Executors = HashMap<Pubkey, TransactionExecutor>;
|
||||||
|
|
||||||
|
#[repr(u8)]
|
||||||
|
#[derive(PartialEq, Debug)]
|
||||||
|
enum TransactionExecutorStatus {
|
||||||
|
/// Executor was already in the cache, no update needed
|
||||||
|
Cached,
|
||||||
|
/// Executor was missing from the cache, but not updated
|
||||||
|
Missing,
|
||||||
|
/// Executor is for an updated program
|
||||||
|
Updated,
|
||||||
|
}
|
||||||
|
|
||||||
/// Tracks whether a given executor is "dirty" and needs to updated in the
|
/// Tracks whether a given executor is "dirty" and needs to updated in the
|
||||||
/// executors cache
|
/// executors cache
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct TransactionExecutor {
|
pub struct TransactionExecutor {
|
||||||
executor: Arc<dyn Executor>,
|
executor: Arc<dyn Executor>,
|
||||||
is_miss: bool,
|
status: TransactionExecutorStatus,
|
||||||
is_updated: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TransactionExecutor {
|
impl TransactionExecutor {
|
||||||
|
@ -92,8 +102,7 @@ impl TransactionExecutor {
|
||||||
pub fn new_cached(executor: Arc<dyn Executor>) -> Self {
|
pub fn new_cached(executor: Arc<dyn Executor>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
executor,
|
executor,
|
||||||
is_miss: false,
|
status: TransactionExecutorStatus::Cached,
|
||||||
is_updated: false,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -102,8 +111,7 @@ impl TransactionExecutor {
|
||||||
pub fn new_miss(executor: Arc<dyn Executor>) -> Self {
|
pub fn new_miss(executor: Arc<dyn Executor>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
executor,
|
executor,
|
||||||
is_miss: true,
|
status: TransactionExecutorStatus::Missing,
|
||||||
is_updated: false,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,22 +120,21 @@ impl TransactionExecutor {
|
||||||
pub fn new_updated(executor: Arc<dyn Executor>) -> Self {
|
pub fn new_updated(executor: Arc<dyn Executor>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
executor,
|
executor,
|
||||||
is_miss: false,
|
status: TransactionExecutorStatus::Updated,
|
||||||
is_updated: true,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_dirty(&self, include_updates: bool) -> bool {
|
pub fn is_missing(&self) -> bool {
|
||||||
self.is_miss || (include_updates && self.is_updated)
|
self.status == TransactionExecutorStatus::Missing
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_updated(&self) -> bool {
|
||||||
|
self.status == TransactionExecutorStatus::Updated
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get(&self) -> Arc<dyn Executor> {
|
pub fn get(&self) -> Arc<dyn Executor> {
|
||||||
self.executor.clone()
|
self.executor.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn clear_miss_for_test(&mut self) {
|
|
||||||
self.is_miss = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Compute meter
|
/// Compute meter
|
||||||
|
|
|
@ -4171,18 +4171,26 @@ impl Bank {
|
||||||
Rc::new(RefCell::new(executors))
|
Rc::new(RefCell::new(executors))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add executors back to the bank's cache if modified
|
/// Add executors back to the bank's cache if they were missing and not updated
|
||||||
fn update_executors(&self, allow_updates: bool, executors: Rc<RefCell<Executors>>) {
|
fn store_missing_executors(&self, executors: &RefCell<Executors>) {
|
||||||
|
self.store_executors_internal(executors, |e| e.is_missing())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add updated executors back to the bank's cache
|
||||||
|
fn store_updated_executors(&self, executors: &RefCell<Executors>) {
|
||||||
|
self.store_executors_internal(executors, |e| e.is_updated())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper to write a selection of executors to the bank's cache
|
||||||
|
fn store_executors_internal(
|
||||||
|
&self,
|
||||||
|
executors: &RefCell<Executors>,
|
||||||
|
selector: impl Fn(&TransactionExecutor) -> bool,
|
||||||
|
) {
|
||||||
let executors = executors.borrow();
|
let executors = executors.borrow();
|
||||||
let dirty_executors: Vec<_> = executors
|
let dirty_executors: Vec<_> = executors
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|(key, executor)| {
|
.filter_map(|(key, executor)| selector(executor).then(|| (key, executor.get())))
|
||||||
if executor.is_dirty(allow_updates) {
|
|
||||||
Some((key, executor.get()))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
if !dirty_executors.is_empty() {
|
if !dirty_executors.is_empty() {
|
||||||
|
@ -4272,6 +4280,14 @@ impl Bank {
|
||||||
process_message_time.as_us()
|
process_message_time.as_us()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let mut store_missing_executors_time = Measure::start("store_missing_executors_time");
|
||||||
|
self.store_missing_executors(&executors);
|
||||||
|
store_missing_executors_time.stop();
|
||||||
|
saturating_add_assign!(
|
||||||
|
timings.execute_accessories.update_executors_us,
|
||||||
|
store_missing_executors_time.as_us()
|
||||||
|
);
|
||||||
|
|
||||||
let status = process_result
|
let status = process_result
|
||||||
.and_then(|info| {
|
.and_then(|info| {
|
||||||
let post_account_state_info =
|
let post_account_state_info =
|
||||||
|
@ -4891,16 +4907,18 @@ impl Bank {
|
||||||
sanitized_txs.len()
|
sanitized_txs.len()
|
||||||
);
|
);
|
||||||
|
|
||||||
let mut update_executors_time = Measure::start("update_executors_time");
|
let mut store_updated_executors_time = Measure::start("store_updated_executors_time");
|
||||||
for execution_result in &execution_results {
|
for execution_result in &execution_results {
|
||||||
if let TransactionExecutionResult::Executed { details, executors } = execution_result {
|
if let TransactionExecutionResult::Executed { details, executors } = execution_result {
|
||||||
self.update_executors(details.status.is_ok(), executors.clone());
|
if details.status.is_ok() {
|
||||||
|
self.store_updated_executors(executors);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
update_executors_time.stop();
|
store_updated_executors_time.stop();
|
||||||
saturating_add_assign!(
|
saturating_add_assign!(
|
||||||
timings.execute_accessories.update_executors_us,
|
timings.execute_accessories.update_executors_us,
|
||||||
update_executors_time.as_us()
|
store_updated_executors_time.as_us()
|
||||||
);
|
);
|
||||||
|
|
||||||
let accounts_data_len_delta = execution_results
|
let accounts_data_len_delta = execution_results
|
||||||
|
@ -14593,12 +14611,8 @@ pub(crate) mod tests {
|
||||||
executors.insert(key3, TransactionExecutor::new_cached(executor.clone()));
|
executors.insert(key3, TransactionExecutor::new_cached(executor.clone()));
|
||||||
executors.insert(key4, TransactionExecutor::new_cached(executor.clone()));
|
executors.insert(key4, TransactionExecutor::new_cached(executor.clone()));
|
||||||
let executors = Rc::new(RefCell::new(executors));
|
let executors = Rc::new(RefCell::new(executors));
|
||||||
executors
|
bank.store_missing_executors(&executors);
|
||||||
.borrow_mut()
|
bank.store_updated_executors(&executors);
|
||||||
.get_mut(&key1)
|
|
||||||
.unwrap()
|
|
||||||
.clear_miss_for_test();
|
|
||||||
bank.update_executors(true, executors);
|
|
||||||
let executors = bank.get_executors(accounts);
|
let executors = bank.get_executors(accounts);
|
||||||
assert_eq!(executors.borrow().len(), 0);
|
assert_eq!(executors.borrow().len(), 0);
|
||||||
|
|
||||||
|
@ -14606,15 +14620,24 @@ pub(crate) mod tests {
|
||||||
let mut executors = Executors::default();
|
let mut executors = Executors::default();
|
||||||
executors.insert(key1, TransactionExecutor::new_miss(executor.clone()));
|
executors.insert(key1, TransactionExecutor::new_miss(executor.clone()));
|
||||||
executors.insert(key2, TransactionExecutor::new_miss(executor.clone()));
|
executors.insert(key2, TransactionExecutor::new_miss(executor.clone()));
|
||||||
executors.insert(key3, TransactionExecutor::new_miss(executor.clone()));
|
executors.insert(key3, TransactionExecutor::new_updated(executor.clone()));
|
||||||
executors.insert(key4, TransactionExecutor::new_miss(executor.clone()));
|
executors.insert(key4, TransactionExecutor::new_miss(executor.clone()));
|
||||||
let executors = Rc::new(RefCell::new(executors));
|
let executors = Rc::new(RefCell::new(executors));
|
||||||
bank.update_executors(true, executors);
|
|
||||||
let executors = bank.get_executors(accounts);
|
// store the new_miss
|
||||||
assert_eq!(executors.borrow().len(), 3);
|
bank.store_missing_executors(&executors);
|
||||||
assert!(executors.borrow().contains_key(&key1));
|
let stored_executors = bank.get_executors(accounts);
|
||||||
assert!(executors.borrow().contains_key(&key2));
|
assert_eq!(stored_executors.borrow().len(), 2);
|
||||||
assert!(executors.borrow().contains_key(&key3));
|
assert!(stored_executors.borrow().contains_key(&key1));
|
||||||
|
assert!(stored_executors.borrow().contains_key(&key2));
|
||||||
|
|
||||||
|
// store the new_updated
|
||||||
|
bank.store_updated_executors(&executors);
|
||||||
|
let stored_executors = bank.get_executors(accounts);
|
||||||
|
assert_eq!(stored_executors.borrow().len(), 3);
|
||||||
|
assert!(stored_executors.borrow().contains_key(&key1));
|
||||||
|
assert!(stored_executors.borrow().contains_key(&key2));
|
||||||
|
assert!(stored_executors.borrow().contains_key(&key3));
|
||||||
|
|
||||||
// Check inheritance
|
// Check inheritance
|
||||||
let bank = Bank::new_from_parent(&Arc::new(bank), &solana_sdk::pubkey::new_rand(), 1);
|
let bank = Bank::new_from_parent(&Arc::new(bank), &solana_sdk::pubkey::new_rand(), 1);
|
||||||
|
@ -14658,7 +14681,7 @@ pub(crate) mod tests {
|
||||||
let mut executors = Executors::default();
|
let mut executors = Executors::default();
|
||||||
executors.insert(key1, TransactionExecutor::new_miss(executor.clone()));
|
executors.insert(key1, TransactionExecutor::new_miss(executor.clone()));
|
||||||
let executors = Rc::new(RefCell::new(executors));
|
let executors = Rc::new(RefCell::new(executors));
|
||||||
root.update_executors(true, executors);
|
root.store_missing_executors(&executors);
|
||||||
let executors = root.get_executors(accounts);
|
let executors = root.get_executors(accounts);
|
||||||
assert_eq!(executors.borrow().len(), 1);
|
assert_eq!(executors.borrow().len(), 1);
|
||||||
|
|
||||||
|
@ -14673,7 +14696,7 @@ pub(crate) mod tests {
|
||||||
let mut executors = Executors::default();
|
let mut executors = Executors::default();
|
||||||
executors.insert(key2, TransactionExecutor::new_miss(executor.clone()));
|
executors.insert(key2, TransactionExecutor::new_miss(executor.clone()));
|
||||||
let executors = Rc::new(RefCell::new(executors));
|
let executors = Rc::new(RefCell::new(executors));
|
||||||
fork1.update_executors(true, executors);
|
fork1.store_missing_executors(&executors);
|
||||||
|
|
||||||
let executors = fork1.get_executors(accounts);
|
let executors = fork1.get_executors(accounts);
|
||||||
assert_eq!(executors.borrow().len(), 2);
|
assert_eq!(executors.borrow().len(), 2);
|
||||||
|
|
Loading…
Reference in New Issue