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

Add drop aware sender new type (fixes #13242) #13495

Merged
merged 8 commits into from
Dec 24, 2024
+57 −11
Merged

Add drop aware sender new type (fixes #13242) #13495

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
25aed3a
Add dropaware Sender new type
ABD-AZE Dec 22, 2024
65709b5
error fixes
ABD-AZE Dec 22, 2024
f8a8160
typo fix
ABD-AZE Dec 22, 2024
3e7ef8c
applied the requested changes
ABD-AZE Dec 23, 2024
10ff2d3
applied the requested changes
ABD-AZE Dec 23, 2024
84063a2
linting
ABD-AZE Dec 23, 2024
7894c0d
Merge branch 'main' into drop-aware-sender-fixes#13242
ABD-AZE Dec 24, 2024
6dd1a73
touchups
mattsse Dec 24, 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
63 changes: 53 additions & 10 deletions crates/rpc/rpc-eth-types/src/cache/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,53 @@ type HeaderLruCache<H, L> = MultiConsumerLruCache<B256, H, L, HeaderResponseSend
pub struct EthStateCache<B: Block, R> {
to_service: UnboundedSender<CacheAction<B, R>>,
}
/// Drop aware sender struct
#[derive(Debug)]
struct ActionSender<B: Block, R: Send + Sync> {
blockhash: B256,
tx: Option<UnboundedSender<CacheAction<B, R>>>,
}

impl<R: Send + Sync, B: Block> ActionSender<B, R> {
fn new(blockhash: B256,tx: Option<UnboundedSender<CacheAction<B, R>>>) -> Self {
Self {blockhash,tx}
}
fn send_block(
&mut self,
block_sender: Result<Option<Arc<SealedBlockWithSenders<B>>>, ProviderError>,
) {
if let Some(tx) = self.tx.take() {
let _ = tx.send(CacheAction::BlockWithSendersResult {
block_hash: self.blockhash,
res: block_sender,
});
}
}
fn send_receipts(&mut self, receipts: Result<Option<Arc<Vec<R>>>, ProviderError>) {
if let Some(tx) = self.tx.take() {
let _ =
tx.send(CacheAction::ReceiptsResult { block_hash: self.blockhash, res: receipts });
}
}
fn send_header(&mut self, header: Result<<B as Block>::Header, ProviderError>) {
if let Some(tx) = self.tx.take() {
let _ = tx.send(CacheAction::HeaderResult {
block_hash: self.blockhash,
res: Box::new(header),
});
}
}
}
impl<R: Send + Sync, B: Block> Drop for ActionSender<B, R> {
fn drop(&mut self) {
if let Some(tx) = self.tx.take() {
let _ = tx.send(CacheAction::BlockWithSendersResult {
block_hash: self.blockhash,
res: Err(ProviderError::CacheServiceUnavailable),
});
}
}
}

impl<B: Block, R> Clone for EthStateCache<B, R> {
fn clone(&self) -> Self {
Expand Down Expand Up @@ -359,6 +406,7 @@ where
let provider = this.provider.clone();
let action_tx = this.action_tx.clone();
let rate_limiter = this.rate_limiter.clone();
let mut action_sender = ActionSender::new(block_hash,Some(action_tx));
this.action_task_spawner.spawn_blocking(Box::pin(async move {
// Acquire permit
let _permit = rate_limiter.acquire().await;
Expand All @@ -370,10 +418,7 @@ where
TransactionVariant::WithHash,
)
.map(|maybe_block| maybe_block.map(Arc::new));
let _ = action_tx.send(CacheAction::BlockWithSendersResult {
block_hash,
res: block_sender,
});
action_sender.send_block(block_sender);
}));
}
}
Expand All @@ -389,15 +434,15 @@ where
let provider = this.provider.clone();
let action_tx = this.action_tx.clone();
let rate_limiter = this.rate_limiter.clone();
let mut action_sender = ActionSender::new(block_hash,Some(action_tx));
this.action_task_spawner.spawn_blocking(Box::pin(async move {
// Acquire permit
let _permit = rate_limiter.acquire().await;
let res = provider
.receipts_by_block(block_hash.into())
.map(|maybe_receipts| maybe_receipts.map(Arc::new));

let _ = action_tx
.send(CacheAction::ReceiptsResult { block_hash, res });
action_sender.send_receipts(res);
}));
}
}
Expand All @@ -414,6 +459,7 @@ where
let provider = this.provider.clone();
let action_tx = this.action_tx.clone();
let rate_limiter = this.rate_limiter.clone();
let mut action_sender = ActionSender::new(block_hash,Some(action_tx));
this.action_task_spawner.spawn_blocking(Box::pin(async move {
// Acquire permit
let _permit = rate_limiter.acquire().await;
Expand All @@ -422,10 +468,7 @@ where
ProviderError::HeaderNotFound(block_hash.into())
})
});
let _ = action_tx.send(CacheAction::HeaderResult {
block_hash,
res: Box::new(header),
});
action_sender.send_header(header);
}));
}
}
Expand Down
Loading