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

include tried and open counts in the logs

This commit is contained in:
Bryan Stitt 2023-10-26 15:16:57 -07:00
parent c5230106fa
commit d50a7a06d9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web3_proxy/src/rpcs/consensus.rs
View File

@ -21,7 +21,6 @@ use std::cmp::{Ordering, Reverse};
use std::sync::{atomic, Arc}; use std::sync::{atomic, Arc};
use std::time::Duration; use std::time::Duration;
use tokio::select; use tokio::select;
use tokio::task::yield_now;
use tokio::time::{sleep_until, Instant}; use tokio::time::{sleep_until, Instant};
use tracing::{debug, enabled, error, info, trace, warn, Level}; use tracing::{debug, enabled, error, info, trace, warn, Level};
@ -913,17 +912,22 @@ impl RpcsForRequest {
} }
let mut earliest_retry_at = None; let mut earliest_retry_at = None;
let mut opened = 0;
let mut tried = 0;
let mut wait_for_sync = Vec::new(); let mut wait_for_sync = Vec::new();
// TODO: we used to do a neat power of 2 random choices here, but it had bugs. bring that back // TODO: we used to do a neat power of 2 random choices here, but it had bugs. bring that back
for rpcs in [self.inner.iter(), self.outer.iter()] { for rpcs in [self.inner.iter(), self.outer.iter()] {
for best_rpc in rpcs { for best_rpc in rpcs {
tried += 1;
match best_rpc match best_rpc
.try_request_handle(&self.request, error_handler, false) .try_request_handle(&self.request, error_handler, false)
.await .await
{ {
Ok(OpenRequestResult::Handle(handle)) => { Ok(OpenRequestResult::Handle(handle)) => {
trace!("opened handle: {}", best_rpc); trace!("opened handle: {}", best_rpc);
opened += 1;
yield handle; yield handle;
} }
Ok(OpenRequestResult::RetryAt(retry_at)) => { Ok(OpenRequestResult::RetryAt(retry_at)) => {
@ -948,11 +952,10 @@ impl RpcsForRequest {
} }
} }
} }
yield_now().await;
} }
// if we got this far, no inner or outer rpcs are ready. thats suprising since an inner should have been ready. maybe it got rate limited // if we got this far, no inner or outer rpcs are ready. thats suprising since an inner should have been ready. maybe it got rate limited
warn!(?earliest_retry_at, num_waits=%wait_for_sync.len(), "no rpcs ready"); warn!(?earliest_retry_at, num_waits=%wait_for_sync.len(), %tried, %opened, "no rpcs ready");
let min_wait_until = Instant::now() + Duration::from_millis(10); let min_wait_until = Instant::now() + Duration::from_millis(10);