gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove cost model from end of slot filtering (#23021)

Browse Source
This commit is contained in:
carllin
2022-02-08 22:32:13 -05:00
committed by GitHub
parent c478510a7f
commit fa264cf7ca
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
core/src/banking_stage.rs
View File

@ -538,7 +538,6 @@ impl BankingStage {
my_pubkey, my_pubkey,
*next_leader, *next_leader,
banking_stage_stats, banking_stage_stats,
cost_model,
); );
Self::update_buffered_packets_with_new_unprocessed( Self::update_buffered_packets_with_new_unprocessed(
original_unprocessed_indexes, original_unprocessed_indexes,
@ -1277,7 +1276,7 @@ impl BankingStage {
banking_stage_stats: &BankingStageStats, banking_stage_stats: &BankingStageStats,
demote_program_write_locks: bool, demote_program_write_locks: bool,
votes_only: bool, votes_only: bool,
cost_model: &Arc<RwLock<CostModel>>, cost_model: Option<&Arc<RwLock<CostModel>>>,
) -> (Vec<HashedTransaction<'static>>, Vec<usize>, Vec<usize>) { ) -> (Vec<HashedTransaction<'static>>, Vec<usize>, Vec<usize>) {
let mut retryable_transaction_packet_indexes: Vec<usize> = vec![]; let mut retryable_transaction_packet_indexes: Vec<usize> = vec![];
@ -1310,20 +1309,22 @@ impl BankingStage {
let is_vote = &packet_batch.packets[tx_index].meta.is_simple_vote_tx; let is_vote = &packet_batch.packets[tx_index].meta.is_simple_vote_tx;
// excluding vote TX from cost_model, for now // excluding vote TX from cost_model, for now
if !is_vote if let Some(cost_model) = &cost_model {
&& read_cost_tracker if !is_vote
.would_transaction_fit( && read_cost_tracker
&tx, .would_transaction_fit(
&cost_model &tx,
.read() &cost_model
.unwrap() .read()
.calculate_cost(&tx, demote_program_write_locks), .unwrap()
) .calculate_cost(&tx, demote_program_write_locks),
.is_err() )
{ .is_err()
debug!("transaction {:?} would exceed limit", tx); {
retryable_transaction_packet_indexes.push(tx_index); debug!("transaction {:?} would exceed limit", tx);
return None; retryable_transaction_packet_indexes.push(tx_index);
return None;
}
} }
Some((tx, tx_index)) Some((tx, tx_index))
}) })
@ -1421,7 +1422,7 @@ impl BankingStage {
banking_stage_stats, banking_stage_stats,
bank.demote_program_write_locks(), bank.demote_program_write_locks(),
bank.vote_only_bank(), bank.vote_only_bank(),
cost_model, Some(cost_model),
); );
packet_conversion_time.stop(); packet_conversion_time.stop();
let cost_model_throttled_transactions_count = cost_model_throttled_packet_indexes.len(); let cost_model_throttled_transactions_count = cost_model_throttled_packet_indexes.len();
@ -1516,7 +1517,6 @@ impl BankingStage {
my_pubkey: &Pubkey, my_pubkey: &Pubkey,
next_leader: Option<Pubkey>, next_leader: Option<Pubkey>,
banking_stage_stats: &BankingStageStats, banking_stage_stats: &BankingStageStats,
cost_model: &Arc<RwLock<CostModel>>,
) -> Vec<usize> { ) -> Vec<usize> {
// Check if we are the next leader. If so, let's not filter the packets // Check if we are the next leader. If so, let's not filter the packets
// as we'll filter it again while processing the packets. // as we'll filter it again while processing the packets.
@ -1538,7 +1538,7 @@ impl BankingStage {
banking_stage_stats, banking_stage_stats,
bank.demote_program_write_locks(), bank.demote_program_write_locks(),
bank.vote_only_bank(), bank.vote_only_bank(),
cost_model, None,
); );
unprocessed_packet_conversion_time.stop(); unprocessed_packet_conversion_time.stop();
@ -1686,7 +1686,6 @@ impl BankingStage {
my_pubkey, my_pubkey,
next_leader, next_leader,
banking_stage_stats, banking_stage_stats,
cost_model,
); );
Self::push_unprocessed( Self::push_unprocessed(
buffered_packet_batches, buffered_packet_batches,
@ -3672,7 +3671,7 @@ mod tests {
&BankingStageStats::default(), &BankingStageStats::default(),
false, false,
votes_only, votes_only,
&Arc::new(RwLock::new(CostModel::default())), Some(&Arc::new(RwLock::new(CostModel::default()))),
); );
assert_eq!(2, txs.len()); assert_eq!(2, txs.len());
assert_eq!(vec![0, 1], tx_packet_index); assert_eq!(vec![0, 1], tx_packet_index);
@ -3687,7 +3686,7 @@ mod tests {
&BankingStageStats::default(), &BankingStageStats::default(),
false, false,
votes_only, votes_only,
&Arc::new(RwLock::new(CostModel::default())), Some(&Arc::new(RwLock::new(CostModel::default()))),
); );
assert_eq!(0, txs.len()); assert_eq!(0, txs.len());
assert_eq!(0, tx_packet_index.len()); assert_eq!(0, tx_packet_index.len());
@ -3711,7 +3710,7 @@ mod tests {
&BankingStageStats::default(), &BankingStageStats::default(),
false, false,
votes_only, votes_only,
&Arc::new(RwLock::new(CostModel::default())), Some(&Arc::new(RwLock::new(CostModel::default()))),
); );
assert_eq!(3, txs.len()); assert_eq!(3, txs.len());
assert_eq!(vec![0, 1, 2], tx_packet_index); assert_eq!(vec![0, 1, 2], tx_packet_index);
@ -3726,7 +3725,7 @@ mod tests {
&BankingStageStats::default(), &BankingStageStats::default(),
false, false,
votes_only, votes_only,
&Arc::new(RwLock::new(CostModel::default())), Some(&Arc::new(RwLock::new(CostModel::default()))),
); );
assert_eq!(2, txs.len()); assert_eq!(2, txs.len());
assert_eq!(vec![0, 2], tx_packet_index); assert_eq!(vec![0, 2], tx_packet_index);
@ -3750,7 +3749,7 @@ mod tests {
&BankingStageStats::default(), &BankingStageStats::default(),
false, false,
votes_only, votes_only,
&Arc::new(RwLock::new(CostModel::default())), Some(&Arc::new(RwLock::new(CostModel::default()))),
); );
assert_eq!(3, txs.len()); assert_eq!(3, txs.len());
assert_eq!(vec![0, 1, 2], tx_packet_index); assert_eq!(vec![0, 1, 2], tx_packet_index);
@ -3765,7 +3764,7 @@ mod tests {
&BankingStageStats::default(), &BankingStageStats::default(),
false, false,
votes_only, votes_only,
&Arc::new(RwLock::new(CostModel::default())), Some(&Arc::new(RwLock::new(CostModel::default()))),
); );
assert_eq!(3, txs.len()); assert_eq!(3, txs.len());
assert_eq!(vec![0, 1, 2], tx_packet_index); assert_eq!(vec![0, 1, 2], tx_packet_index);