diff --git a/crates/client/src/graphs/mod.rs b/crates/client/src/graphs/mod.rs index 6175509aa..75ef2e5aa 100644 --- a/crates/client/src/graphs/mod.rs +++ b/crates/client/src/graphs/mod.rs @@ -1,4 +1,5 @@ use crate::graphs::graph_query::get_meta_data_query; +use rand::Rng; use std::time::Duration; use tokio::time::sleep; @@ -58,7 +59,17 @@ impl GraphQueryClient { body ); if attempt < GRAPH_QUERY_RETRY_MAX_ATTEMPTS { - let delay = GRAPH_QUERY_RETRY_BASE_DELAY_MS * attempt as u64; + let delay = match status { + reqwest::StatusCode::SERVICE_UNAVAILABLE + | reqwest::StatusCode::TOO_MANY_REQUESTS => { + if attempt == 1 { + rand::thread_rng().gen_range(1_000..=3_000) + } else { + rand::thread_rng().gen_range(3_000..=8_000) + } + } + _ => GRAPH_QUERY_RETRY_BASE_DELAY_MS * attempt as u64, + }; sleep(Duration::from_millis(delay)).await; last_err = Some(err); continue; diff --git a/localnet/scripts/gen-node-envs.sh b/localnet/scripts/gen-node-envs.sh index a130e394b..be971dfaa 100755 --- a/localnet/scripts/gen-node-envs.sh +++ b/localnet/scripts/gen-node-envs.sh @@ -40,6 +40,7 @@ RUST_LOG=$RUST_LOG BITCOIN_NETWORK=$BITCOIN_NETWORK BTC_CHAIN_URL=$BTC_CHAIN_URL GOAT_CHAIN_URL=$GOAT_CHAIN_URL +LOCALNET_FAST_GRAPH_POLL=$([[ "$GOAT_BACKEND" == anvil ]] && echo 1 || echo 0) # the graph / contracts (read from state/*.json) MIN_REQUIRED_VERIFIER=$MIN_REQUIRED_VERIFIER diff --git a/node/src/scheduled_tasks/event_watch/mod.rs b/node/src/scheduled_tasks/event_watch/mod.rs index 09d4e5d00..7a9cd8e9a 100644 --- a/node/src/scheduled_tasks/event_watch/mod.rs +++ b/node/src/scheduled_tasks/event_watch/mod.rs @@ -515,9 +515,22 @@ pub async fn run_watch_event_task( })], ), ]); + let (poll_interval, startup_jitter_ms, poll_jitter_ms) = + if std::env::var("LOCALNET_FAST_GRAPH_POLL").as_deref() == Ok("1") { + (Duration::from_secs(2), 500, 500) + } else { + (Duration::from_secs(interval.max(12)), 12_000, 6_000) + }; + let mut poll_delay = + Duration::from_millis(rand::Rng::gen_range(&mut rand::thread_rng(), 0..=startup_jitter_ms)); loop { tokio::select! { - _ = tokio::time::sleep(Duration::from_secs(interval)) => { + _ = tokio::time::sleep(poll_delay) => { + poll_delay = poll_interval + + Duration::from_millis(rand::Rng::gen_range( + &mut rand::thread_rng(), + 0..=poll_jitter_ms, + )); let started_at = Instant::now(); // Execute the normal monitoring logic match monitor_events(