tornadocontrib/web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try timeout inside the cache get again but with shorter timeouts

Browse Source
This commit is contained in:
Bryan Stitt 2023-09-19 18:37:34 -07:00
parent 98da8cdfa7
commit 8a0c2dfdc1
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
web3_proxy/src/app/mod.rs
View File

@ -1734,7 +1734,9 @@ impl Web3ProxyApp {
}; };
// TODO: think more about timeouts // TODO: think more about timeouts
let max_wait = Some(Duration::from_secs(299)); // TODO: different user tiers should have different timeouts
// erigon's timeout is 300, so keep this a few seconds shorter
let max_wait = Some(Duration::from_secs(295));
if let Some(cache_key) = cache_key { if let Some(cache_key) = cache_key {
let from_block_num = cache_key.from_block_num().copied(); let from_block_num = cache_key.from_block_num().copied();
@ -1746,11 +1748,11 @@ impl Web3ProxyApp {
// TODO: try to fetch out of s3 // TODO: try to fetch out of s3
timeout(Duration::from_secs(300), self self
.jsonrpc_response_cache .jsonrpc_response_cache
.try_get_with::<_, Web3ProxyError>(cache_key.hash(), async { .try_get_with::<_, Web3ProxyError>(cache_key.hash(), async {
// TODO: think more about this timeout. we should probably have a `request_expires_at` Duration on the request_metadata // TODO: think more about this timeout. we should probably have a `request_expires_at` Duration on the request_metadata
let response_data = self.balanced_rpcs let response_data = timeout(Duration::from_secs(290), self.balanced_rpcs
.try_proxy_connection::<_, Arc<RawValue>>( .try_proxy_connection::<_, Arc<RawValue>>(
method, method,
params, params,
@ -1758,30 +1760,35 @@ impl Web3ProxyApp {
max_wait, max_wait,
from_block_num.as_ref(), from_block_num.as_ref(),
to_block_num.as_ref(), to_block_num.as_ref(),
).await; )).await;
if !cache_jsonrpc_errors && let Err(err) = response_data { match response_data {
// if we are not supposed to cache jsonrpc errors, Ok(response_data) => {
// then we must not convert Provider errors into a JsonRpcResponseEnum if !cache_jsonrpc_errors && let Err(err) = response_data {
// return all the errors now. moka will not cache Err results // if we are not supposed to cache jsonrpc errors,
Err(err) // then we must not convert Provider errors into a JsonRpcResponseEnum
} else { // return all the errors now. moka will not cache Err results
// convert jsonrpc errors into JsonRpcResponseEnum, but leave the rest as errors Err(err)
let response_data: JsonRpcResponseEnum<Arc<RawValue>> = response_data.try_into()?; } else {
// convert jsonrpc errors into JsonRpcResponseEnum, but leave the rest as errors
let response_data: JsonRpcResponseEnum<Arc<RawValue>> = response_data.try_into()?;
if response_data.is_null() { if response_data.is_null() {
// don't ever cache "null" as a success. its too likely to be a problem // don't ever cache "null" as a success. its too likely to be a problem
Err(Web3ProxyError::NullJsonRpcResult) Err(Web3ProxyError::NullJsonRpcResult)
} else if response_data.num_bytes() > max_response_cache_bytes { } else if response_data.num_bytes() > max_response_cache_bytes {
// don't cache really large requests // don't cache really large requests
// TODO: emit a stat // TODO: emit a stat
Err(Web3ProxyError::JsonRpcResponse(response_data)) Err(Web3ProxyError::JsonRpcResponse(response_data))
} else { } else {
// TODO: response data should maybe be Arc<JsonRpcResponseEnum<Box<RawValue>>>, but that's more work // TODO: response data should maybe be Arc<JsonRpcResponseEnum<Box<RawValue>>>, but that's more work
Ok(response_data) Ok(response_data)
}
}
} }
Err(err) => Err(Web3ProxyError::from(err)),
} }
})).await?? }).await?
} else { } else {
let x = timeout( let x = timeout(
Duration::from_secs(300), Duration::from_secs(300),

2
web3_proxy/src/response_cache.rs
View File

@ -14,7 +14,7 @@ use std::{
#[derive(Clone, Debug, Eq, From)] #[derive(Clone, Debug, Eq, From)]
pub struct JsonRpcQueryCacheKey { pub struct JsonRpcQueryCacheKey {
/// hashed inputs /// hashed params
hash: u64, hash: u64,
from_block: Option<BlockNumAndHash>, from_block: Option<BlockNumAndHash>,
to_block: Option<BlockNumAndHash>, to_block: Option<BlockNumAndHash>,