Iotedge Check: Timeout for aka.ms latest version http request (#6937)

Azure · Mar 7, 2023 · f7dd1aa · f7dd1aa
1 parent 82ca5e8
commit f7dd1aa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/edgelet/iotedge/src/check/checks/aziot_edged_version.rs b/edgelet/iotedge/src/check/checks/aziot_edged_version.rs
@@ -1,9 +1,13 @@
+use std::time::Duration;
+
 use anyhow::{anyhow, Context};
 use regex::Regex;
 
 use crate::check::{Check, CheckResult, Checker, CheckerMeta};
 use crate::error::{Error, FetchLatestVersionsReason};
 
+const AKA_MS_HTTP_REQUEST_TIMEOUT: Duration = Duration::from_secs(300);
+
 #[derive(Default, serde::Serialize)]
 pub(crate) struct AziotEdgedVersion {
     actual_version: Option<String>,
@@ -53,12 +57,21 @@ impl AziotEdgedVersion {
                 req
             };
 
-            let res = client
-                .request(req)
-                .await
-                .context(Error::FetchLatestVersions(
-                    FetchLatestVersionsReason::GetResponse,
-                ))?;
+            let res = tokio::time::timeout(AKA_MS_HTTP_REQUEST_TIMEOUT, client.request(req)).await;
+            let res = match res {
+                Ok(Ok(res)) => res,
+                Ok(Err(e)) => {
+                    return Err(e).context(Error::FetchLatestVersions(
+                        FetchLatestVersionsReason::GetResponse,
+                    ));
+                }
+                Err(e) => {
+                    return Err(e).context(Error::FetchLatestVersions(
+                        FetchLatestVersionsReason::RequestTimeout,
+                    ));
+                }
+            };
+
             match res.status() {
                 status_code if status_code.is_redirection() => {
                     uri = res

diff --git a/edgelet/iotedge/src/error.rs b/edgelet/iotedge/src/error.rs
@@ -61,6 +61,7 @@ pub enum Error {
 
 #[derive(Clone, Copy, Debug)]
 pub enum FetchLatestVersionsReason {
+    RequestTimeout,
     CreateClient,
     GetResponse,
     InvalidOrMissingLocationHeader,
@@ -72,6 +73,7 @@ impl fmt::Display for FetchLatestVersionsReason {
         match self {
             FetchLatestVersionsReason::CreateClient => write!(f, "could not create HTTP client"),
             FetchLatestVersionsReason::GetResponse => write!(f, "could not send HTTP request"),
+            FetchLatestVersionsReason::RequestTimeout => write!(f, "HTTP request timed out"),
             FetchLatestVersionsReason::InvalidOrMissingLocationHeader => write!(
                 f,
                 "redirect response has invalid or missing location header"