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

disable qos adjustment logic when feature apply_cost_tracker_during_replay is activated (#31671) 

* disable qos adjustment logic when feature apply_cost_tracker_during_replay is activated
This commit is contained in:
Tao Zhu 2023-05-17 11:24:59 -05:00 committed by GitHub
parent b03422968b
commit 692e1f261a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/banking_stage/consumer.rs
View File

@ -26,7 +26,7 @@ use {
}, },
solana_sdk::{ solana_sdk::{
clock::{FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET, MAX_PROCESSING_AGE}, clock::{FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET, MAX_PROCESSING_AGE},
saturating_add_assign, feature_set, saturating_add_assign,
timing::timestamp, timing::timestamp,
transaction::{self, SanitizedTransaction, TransactionError}, transaction::{self, SanitizedTransaction, TransactionError},
}, },
@ -429,11 +429,19 @@ impl Consumer {
.. ..
} = execute_and_commit_transactions_output; } = execute_and_commit_transactions_output;
QosService::update_or_remove_transaction_costs( // once feature `apply_cost_tracker_during_replay` is activated, leader shall no longer
transaction_qos_cost_results.iter(), // adjust block with executed cost (a behavior more inline with bankless leader), instead
commit_transactions_result.as_ref().ok(), // will be exclusively using requested `compute_unit_limit` in cost tracking.
bank, if !bank
); .feature_set
.is_active(&feature_set::apply_cost_tracker_during_replay::id())
{
QosService::update_or_remove_transaction_costs(
transaction_qos_cost_results.iter(),
commit_transactions_result.as_ref().ok(),
bank,
);
}
retryable_transaction_indexes retryable_transaction_indexes
.iter_mut() .iter_mut()
@ -1074,7 +1082,9 @@ mod tests {
mint_keypair, mint_keypair,
.. ..
} = create_slow_genesis_config(10_000); } = create_slow_genesis_config(10_000);
let bank = Arc::new(Bank::new_no_wallclock_throttle_for_tests(&genesis_config)); let mut bank = Bank::new_no_wallclock_throttle_for_tests(&genesis_config);
bank.deactivate_feature(&feature_set::apply_cost_tracker_during_replay::id());
let bank = Arc::new(bank);
let pubkey = solana_sdk::pubkey::new_rand(); let pubkey = solana_sdk::pubkey::new_rand();
let ledger_path = get_tmp_ledger_path_auto_delete!(); let ledger_path = get_tmp_ledger_path_auto_delete!();