Merge pull request #1298 from Phala-Network/poller-timeout

phat-poller: Fix fetch profiles timeout

Author: kvinwang

poller.Dockerfile

@@ -17,7 +17,7 @@ RUN mkdir -p build-out/
 RUN cp target/x86_64-unknown-linux-musl/release/phat-poller build-out/
 RUN strip build-out/phat-poller
 
-FROM scratch
+FROM alpine
 WORKDIR /app
 COPY --from=builder /root/build-out/phat-poller .
 USER 1000:1000

standalone/phat-poller/src/app.rs

@@ -12,7 +12,7 @@ use std::{
     time::Duration,
 };
 
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, Result, Context};
 use phaxt::AccountId;
 use sp_core::{sr25519::Pair as KeyPair, H256};
 use tokio::task::JoinHandle;
@@ -297,8 +297,16 @@ impl App {
             info!("poll contracts begin");
             let start = Instant::now();
             self.state.lock().unwrap().last_poll_time = Some(start);
-            if let Err(err) = self.poll_contracts().await {
-                warn!("failed to poll contracts: {err}");
+            let result =
+                tokio::time::timeout(self.config.poll_timeout_overall, self.poll_contracts()).await;
+            match result {
+                Err(_) => {
+                    warn!("poll contracts timeout");
+                }
+                Ok(Err(err)) => {
+                    warn!("failed to poll contracts: {err}");
+                }
+                Ok(Ok(())) => {}
             }
             let rest_time = self.config.poll_interval.saturating_sub(start.elapsed());
             info!("{}ms elapsed", start.elapsed().as_millis());
@@ -332,17 +340,20 @@ impl App {
             info!(latency=?worker.latency().unwrap_or(Duration::MAX), "  {}", worker.pubkey);
         }
         let worker = &top_workers[0];
-        let contracts: Vec<(AccountId, ContractId)> =
+        let contracts: Vec<(AccountId, ContractId)> = tokio::time::timeout(
+            self.config.poll_timeout,
             pink_query::<_, crate::contracts::UserProfilesResponse>(
                 &worker.pubkey,
                 &worker.uri,
                 self.config.factory_contract,
                 SELECTOR_GET_USER_PROFILES,
                 (),
                 &self.config.caller,
-            )
-            .await?
-            .or(Err(anyhow::anyhow!("query failed")))?;
+            ),
+        )
+        .await
+        .context("Get profiles timeout")??
+        .or(Err(anyhow::anyhow!("query failed")))?;
 
         let mut poll_handles = Vec::with_capacity(contracts.len());
 

standalone/phat-poller/src/args.rs

@@ -49,6 +49,10 @@ pub struct RunArgs {
     #[arg(long, value_parser = parse_duration, default_value = "10s")]
     pub poll_timeout: Duration,
 
+    /// Contract poll timeout over all contracts
+    #[arg(long, value_parser = parse_duration, default_value = "20s")]
+    pub poll_timeout_overall: Duration,
+
     /// Top n workers to be used to poll
     #[arg(long, default_value_t = 5)]
     pub use_top_workers: usize,