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

account_saver: collect SanitizedTransaction references #2820

Merged
merged 2 commits into from
Sep 9, 2024
Merged

account_saver: collect SanitizedTransaction references #2820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
435c2f9
account_saver_geyser_hack
apfitzge Sep 3, 2024
82619c1
use core::borrow::Borrow
apfitzge Sep 4, 2024
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
65 changes: 48 additions & 17 deletions runtime/src/account_saver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use {
core::borrow::Borrow,
solana_sdk::{
account::AccountSharedData, nonce::state::DurableNonce, pubkey::Pubkey,
transaction_context::TransactionAccount,
transaction::SanitizedTransaction, transaction_context::TransactionAccount,
},
solana_svm::{
rollback_accounts::RollbackAccounts,
Expand Down Expand Up @@ -40,36 +41,53 @@ fn max_number_of_accounts_to_collect(
.sum()
}

// Due to the current geyser interface, we are forced to collect references to
// `SanitizedTransaction` - even if that's not the type that we have.
// Until that interface changes, this function takes in an additional
// `txs_refs` parameter that collects references to `SanitizedTransaction`
// if it's provided.
// If geyser is not used, `txs_refs` should be `None`, since the work would
// be useless.
pub fn collect_accounts_to_store<'a, T: SVMMessage>(
txs: &'a [T],
txs_refs: &'a Option<Vec<impl Borrow<SanitizedTransaction>>>,
processing_results: &'a mut [TransactionProcessingResult],
durable_nonce: &DurableNonce,
lamports_per_signature: u64,
collect_transactions: bool,
) -> (Vec<(&'a Pubkey, &'a AccountSharedData)>, Option<Vec<&'a T>>) {
) -> (
Vec<(&'a Pubkey, &'a AccountSharedData)>,
Option<Vec<&'a SanitizedTransaction>>,
) {
let collect_capacity = max_number_of_accounts_to_collect(txs, processing_results);
let mut accounts = Vec::with_capacity(collect_capacity);
let mut transactions = collect_transactions.then(|| Vec::with_capacity(collect_capacity));
for (processing_result, transaction) in processing_results.iter_mut().zip(txs) {
let mut transactions = txs_refs
.is_some()
.then(|| Vec::with_capacity(collect_capacity));
for (index, (processing_result, transaction)) in
processing_results.iter_mut().zip(txs).enumerate()
{
let Some(processed_tx) = processing_result.processed_transaction_mut() else {
// Don't store any accounts if tx wasn't executed
continue;
};

let transaction_ref = txs_refs.as_ref().map(|txs_refs| txs_refs[index].borrow());
match processed_tx {
ProcessedTransaction::Executed(executed_tx) => {
if executed_tx.execution_details.status.is_ok() {
collect_accounts_for_successful_tx(
&mut accounts,
&mut transactions,
transaction,
transaction_ref,
&executed_tx.loaded_transaction.accounts,
);
} else {
collect_accounts_for_failed_tx(
&mut accounts,
&mut transactions,
transaction,
transaction_ref,
&mut executed_tx.loaded_transaction.rollback_accounts,
durable_nonce,
lamports_per_signature,
Expand All @@ -81,6 +99,7 @@ pub fn collect_accounts_to_store<'a, T: SVMMessage>(
&mut accounts,
&mut transactions,
transaction,
transaction_ref,
&mut fees_only_tx.rollback_accounts,
durable_nonce,
lamports_per_signature,
Expand All @@ -93,8 +112,9 @@ pub fn collect_accounts_to_store<'a, T: SVMMessage>(

fn collect_accounts_for_successful_tx<'a, T: SVMMessage>(
collected_accounts: &mut Vec<(&'a Pubkey, &'a AccountSharedData)>,
collected_account_transactions: &mut Option<Vec<&'a T>>,
collected_account_transactions: &mut Option<Vec<&'a SanitizedTransaction>>,
transaction: &'a T,
transaction_ref: Option<&'a SanitizedTransaction>,
transaction_accounts: &'a [TransactionAccount],
) {
for (_, (address, account)) in (0..transaction.account_keys().len())
Expand All @@ -111,15 +131,17 @@ fn collect_accounts_for_successful_tx<'a, T: SVMMessage>(
{
collected_accounts.push((address, account));
if let Some(collected_account_transactions) = collected_account_transactions {
collected_account_transactions.push(transaction);
collected_account_transactions
.push(transaction_ref.expect("transaction ref must exist if collecting"));
}
}
}

fn collect_accounts_for_failed_tx<'a, T: SVMMessage>(
collected_accounts: &mut Vec<(&'a Pubkey, &'a AccountSharedData)>,
collected_account_transactions: &mut Option<Vec<&'a T>>,
collected_account_transactions: &mut Option<Vec<&'a SanitizedTransaction>>,
transaction: &'a T,
transaction_ref: Option<&'a SanitizedTransaction>,
rollback_accounts: &'a mut RollbackAccounts,
durable_nonce: &DurableNonce,
lamports_per_signature: u64,
Expand All @@ -129,7 +151,8 @@ fn collect_accounts_for_failed_tx<'a, T: SVMMessage>(
RollbackAccounts::FeePayerOnly { fee_payer_account } => {
collected_accounts.push((fee_payer_address, &*fee_payer_account));
if let Some(collected_account_transactions) = collected_account_transactions {
collected_account_transactions.push(transaction);
collected_account_transactions
.push(transaction_ref.expect("transaction ref must exist if collecting"));
}
}
RollbackAccounts::SameNonceAndFeePayer { nonce } => {
Expand All @@ -140,7 +163,8 @@ fn collect_accounts_for_failed_tx<'a, T: SVMMessage>(
.unwrap();
collected_accounts.push((nonce.address(), nonce.account()));
if let Some(collected_account_transactions) = collected_account_transactions {
collected_account_transactions.push(transaction);
collected_account_transactions
.push(transaction_ref.expect("transaction ref must exist if collecting"));
}
}
RollbackAccounts::SeparateNonceAndFeePayer {
Expand All @@ -149,7 +173,8 @@ fn collect_accounts_for_failed_tx<'a, T: SVMMessage>(
} => {
collected_accounts.push((fee_payer_address, &*fee_payer_account));
if let Some(collected_account_transactions) = collected_account_transactions {
collected_account_transactions.push(transaction);
collected_account_transactions
.push(transaction_ref.expect("transaction ref must exist if collecting"));
}

// Since we know we are dealing with a valid nonce account,
Expand All @@ -159,7 +184,8 @@ fn collect_accounts_for_failed_tx<'a, T: SVMMessage>(
.unwrap();
collected_accounts.push((nonce.address(), nonce.account()));
if let Some(collected_account_transactions) = collected_account_transactions {
collected_account_transactions.push(transaction);
collected_account_transactions
.push(transaction_ref.expect("transaction ref must exist if collecting"));
}
}
}
Expand Down Expand Up @@ -297,12 +323,13 @@ mod tests {
assert_eq!(max_collected_accounts, 2);

for collect_transactions in [false, true] {
let transaction_refs = collect_transactions.then(|| txs.iter().collect::<Vec<_>>());
let (collected_accounts, transactions) = collect_accounts_to_store(
&txs,
&transaction_refs,
&mut processing_results,
&DurableNonce::default(),
0,
collect_transactions,
);
assert_eq!(collected_accounts.len(), 2);
assert!(collected_accounts
Expand Down Expand Up @@ -368,12 +395,13 @@ mod tests {
let durable_nonce = DurableNonce::from_blockhash(&Hash::new_unique());

for collect_transactions in [false, true] {
let transaction_refs = collect_transactions.then(|| txs.iter().collect::<Vec<_>>());
let (collected_accounts, transactions) = collect_accounts_to_store(
&txs,
&transaction_refs,
&mut processing_results,
&durable_nonce,
0,
collect_transactions,
);
assert_eq!(collected_accounts.len(), 1);
assert_eq!(
Expand Down Expand Up @@ -468,12 +496,13 @@ mod tests {
assert_eq!(max_collected_accounts, 2);

for collect_transactions in [false, true] {
let transaction_refs = collect_transactions.then(|| txs.iter().collect::<Vec<_>>());
let (collected_accounts, transactions) = collect_accounts_to_store(
&txs,
&transaction_refs,
&mut processing_results,
&durable_nonce,
0,
collect_transactions,
);
assert_eq!(collected_accounts.len(), 2);
assert_eq!(
Expand Down Expand Up @@ -581,12 +610,13 @@ mod tests {
assert_eq!(max_collected_accounts, 1);

for collect_transactions in [false, true] {
let transaction_refs = collect_transactions.then(|| txs.iter().collect::<Vec<_>>());
let (collected_accounts, transactions) = collect_accounts_to_store(
&txs,
&transaction_refs,
&mut processing_results,
&durable_nonce,
0,
collect_transactions,
);
assert_eq!(collected_accounts.len(), 1);
let collected_nonce_account = collected_accounts
Expand Down Expand Up @@ -642,12 +672,13 @@ mod tests {
let durable_nonce = DurableNonce::from_blockhash(&Hash::new_unique());

for collect_transactions in [false, true] {
let transaction_refs = collect_transactions.then(|| txs.iter().collect::<Vec<_>>());
let (collected_accounts, transactions) = collect_accounts_to_store(
&txs,
&transaction_refs,
&mut processing_results,
&durable_nonce,
0,
collect_transactions,
);
assert_eq!(collected_accounts.len(), 1);
assert_eq!(
Expand Down
12 changes: 11 additions & 1 deletion runtime/src/bank.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3799,12 +3799,22 @@ impl Bank {

let ((), store_accounts_us) = measure_us!({
let durable_nonce = DurableNonce::from_blockhash(&last_blockhash);

// If geyser is present, we must collect `SanitizedTransaction`
// references in order to comply with that interface - until it
// is changed.
Comment on lines +3804 to +3805
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who is owning changing the geyser interface? Should it be required that the interface is updated before releasing v2.1 so that the extra allocation doesn't actually get released to the wild?

How significant is this allocation in practice (assuming geyser is in use)?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I am "owning" the actual changes of the geyser interface. But have not had luck in getting reviews of related code.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These per batch allocations should be minimal compared to the per ingested allocations of regular transactions. Jemalloc is relatively well suited for these regular allocations

let maybe_transaction_refs = self
.accounts()
.accounts_db
.has_accounts_update_notifier()
.then(|| sanitized_txs.iter().collect::<Vec<_>>());

let (accounts_to_store, transactions) = collect_accounts_to_store(
sanitized_txs,
&maybe_transaction_refs,
&mut processing_results,
&durable_nonce,
lamports_per_signature,
self.accounts().accounts_db.has_accounts_update_notifier(),
);
self.rc.accounts.store_cached(
(self.slot(), accounts_to_store.as_slice()),
Expand Down