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

Remove RwLock on TransactionNotifier #33962

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Remove RwLock on TransactionNotifier #33962

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
63ef2b2
Remove RwLock on TransactionNotifier
lijunwangs Nov 6, 2023
4ae21fc
Nit fix
lijunwangs Nov 7, 2023
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
6 changes: 3 additions & 3 deletions core/src/validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ use {
rpc_pubsub_service::{PubSubConfig, PubSubService},
rpc_service::JsonRpcService,
rpc_subscriptions::RpcSubscriptions,
transaction_notifier_interface::TransactionNotifierLock,
transaction_notifier_interface::TransactionNotifierArc,
transaction_status_service::TransactionStatusService,
},
solana_runtime::{
Expand Down Expand Up @@ -1689,7 +1689,7 @@ fn load_blockstore(
exit: Arc<AtomicBool>,
start_progress: &Arc<RwLock<ValidatorStartProgress>>,
accounts_update_notifier: Option<AccountsUpdateNotifier>,
transaction_notifier: Option<TransactionNotifierLock>,
transaction_notifier: Option<TransactionNotifierArc>,
entry_notifier: Option<EntryNotifierArc>,
poh_timing_point_sender: Option<PohTimingSender>,
) -> Result<
Expand Down Expand Up @@ -2167,7 +2167,7 @@ fn initialize_rpc_transaction_history_services(
exit: Arc<AtomicBool>,
enable_rpc_transaction_history: bool,
enable_extended_tx_metadata_storage: bool,
transaction_notifier: Option<TransactionNotifierLock>,
transaction_notifier: Option<TransactionNotifierArc>,
) -> TransactionHistoryServices {
let max_complete_transaction_status_slot = Arc::new(AtomicU64::new(blockstore.max_root()));
let (transaction_status_sender, transaction_status_receiver) = unbounded();
Expand Down
10 changes: 5 additions & 5 deletions geyser-plugin-manager/src/geyser_plugin_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use {
solana_ledger::entry_notifier_interface::EntryNotifierArc,
solana_rpc::{
optimistically_confirmed_bank_tracker::SlotNotification,
transaction_notifier_interface::TransactionNotifierLock,
transaction_notifier_interface::TransactionNotifierArc,
},
std::{
path::{Path, PathBuf},
Expand All @@ -34,7 +34,7 @@ pub struct GeyserPluginService {
slot_status_observer: Option<SlotStatusObserver>,
plugin_manager: Arc<RwLock<GeyserPluginManager>>,
accounts_update_notifier: Option<AccountsUpdateNotifier>,
transaction_notifier: Option<TransactionNotifierLock>,
transaction_notifier: Option<TransactionNotifierArc>,
entry_notifier: Option<EntryNotifierArc>,
block_metadata_notifier: Option<BlockMetadataNotifierLock>,
}
Expand Down Expand Up @@ -92,10 +92,10 @@ impl GeyserPluginService {
None
};

let transaction_notifier: Option<TransactionNotifierLock> =
let transaction_notifier: Option<TransactionNotifierArc> =
if transaction_notifications_enabled {
let transaction_notifier = TransactionNotifierImpl::new(plugin_manager.clone());
Some(Arc::new(RwLock::new(transaction_notifier)))
Some(Arc::new(transaction_notifier))
} else {
None
};
Expand Down Expand Up @@ -160,7 +160,7 @@ impl GeyserPluginService {
self.accounts_update_notifier.clone()
}

pub fn get_transaction_notifier(&self) -> Option<TransactionNotifierLock> {
pub fn get_transaction_notifier(&self) -> Option<TransactionNotifierArc> {
self.transaction_notifier.clone()
}

Expand Down
4 changes: 2 additions & 2 deletions rpc/src/transaction_notifier_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
solana_sdk::{clock::Slot, signature::Signature, transaction::SanitizedTransaction},
solana_transaction_status::TransactionStatusMeta,
std::sync::{Arc, RwLock},
std::sync::Arc,
};

pub trait TransactionNotifier {
Expand All @@ -15,4 +15,4 @@ pub trait TransactionNotifier {
);
}

pub type TransactionNotifierLock = Arc<RwLock<dyn TransactionNotifier + Sync + Send>>;
pub type TransactionNotifierArc = Arc<dyn TransactionNotifier + Sync + Send>;
19 changes: 9 additions & 10 deletions rpc/src/transaction_status_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use {
crate::transaction_notifier_interface::TransactionNotifierLock,
crate::transaction_notifier_interface::TransactionNotifierArc,
crossbeam_channel::{Receiver, RecvTimeoutError},
itertools::izip,
solana_accounts_db::transaction_results::{DurableNonceFee, TransactionExecutionDetails},
Expand Down Expand Up @@ -29,7 +29,7 @@ impl TransactionStatusService {
write_transaction_status_receiver: Receiver<TransactionStatusMessage>,
max_complete_transaction_status_slot: Arc<AtomicU64>,
enable_rpc_transaction_history: bool,
transaction_notifier: Option<TransactionNotifierLock>,
transaction_notifier: Option<TransactionNotifierArc>,
blockstore: Arc<Blockstore>,
enable_extended_tx_metadata_storage: bool,
exit: Arc<AtomicBool>,
Expand Down Expand Up @@ -60,7 +60,7 @@ impl TransactionStatusService {
write_transaction_status_receiver: &Receiver<TransactionStatusMessage>,
max_complete_transaction_status_slot: &Arc<AtomicU64>,
enable_rpc_transaction_history: bool,
transaction_notifier: Option<TransactionNotifierLock>,
transaction_notifier: Option<TransactionNotifierArc>,
blockstore: &Blockstore,
enable_extended_tx_metadata_storage: bool,
) -> Result<(), RecvTimeoutError> {
Expand Down Expand Up @@ -169,7 +169,7 @@ impl TransactionStatusService {
};

if let Some(transaction_notifier) = transaction_notifier.as_ref() {
transaction_notifier.write().unwrap().notify_transaction(
transaction_notifier.notify_transaction(
slot,
transaction_index,
transaction.signature(),
Expand Down Expand Up @@ -255,7 +255,7 @@ pub(crate) mod tests {
std::{
sync::{
atomic::{AtomicBool, Ordering},
Arc, RwLock,
Arc,
},
thread::sleep,
time::Duration,
Expand Down Expand Up @@ -432,7 +432,7 @@ pub(crate) mod tests {
transaction_indexes: vec![transaction_index],
};

let test_notifier = Arc::new(RwLock::new(TestTransactionNotifier::new()));
let test_notifier = Arc::new(TestTransactionNotifier::new());

let exit = Arc::new(AtomicBool::new(false));
let transaction_status_service = TransactionStatusService::new(
Expand All @@ -452,16 +452,15 @@ pub(crate) mod tests {

exit.store(true, Ordering::Relaxed);
transaction_status_service.join().unwrap();
let notifier = test_notifier.read().unwrap();
assert_eq!(notifier.notifications.len(), 1);
assert_eq!(test_notifier.notifications.len(), 1);
let key = TestNotifierKey {
slot,
transaction_index,
signature,
};
assert!(notifier.notifications.contains_key(&key));
assert!(test_notifier.notifications.contains_key(&key));

let result = &*notifier.notifications.get(&key).unwrap();
let result = test_notifier.notifications.get(&key).unwrap();
assert_eq!(
expected_transaction.signature(),
result.transaction.signature()
Expand Down