Add retry logic to identity client (#292)

This adds retry logic so that edged will retry some requests. A follow-up pr for the iotedge repo will make edged use the new functionality.
Azure · Oct 5, 2021 · 9a12cd3 · 9a12cd3
1 parent a1087ff
commit 9a12cd3
Show file tree

Hide file tree

Showing 10 changed files with 266 additions and 138 deletions.
diff --git a/aziotctl/src/internal/check/checks/read_certs.rs b/aziotctl/src/internal/check/checks/read_certs.rs
@@ -43,6 +43,7 @@ impl ReadCerts {
         let cert_client = aziot_cert_client_async::Client::new(
             aziot_cert_common_http::ApiVersion::V2020_09_01,
             aziot_certd.clone(),
+            0,
         );
 
         let mut err_aggregated = String::new();

diff --git a/aziotctl/src/internal/check/checks/read_key_pairs.rs b/aziotctl/src/internal/check/checks/read_key_pairs.rs
@@ -45,6 +45,7 @@ impl ReadKeyPairs {
         let key_client = aziot_key_client_async::Client::new(
             aziot_key_common_http::ApiVersion::V2021_05_01,
             aziot_keyd.clone(),
+            0,
         );
 
         let mut key_engine = {

diff --git a/aziotctl/src/system.rs b/aziotctl/src/system.rs
@@ -93,6 +93,7 @@ async fn reprovision(uri: &url::Url) -> Result<()> {
     let client = aziot_identity_client_async::Client::new(
         aziot_identity_common_http::ApiVersion::V2020_09_01,
         connector,
+        0,
     );
 
     match client.reprovision().await {

diff --git a/cert/aziot-cert-client-async/src/lib.rs b/cert/aziot-cert-client-async/src/lib.rs
@@ -12,15 +12,21 @@
 pub struct Client {
     api_version: aziot_cert_common_http::ApiVersion,
     inner: hyper::Client<http_common::Connector, hyper::Body>,
+    max_retries: u32,
 }
 
 impl Client {
     pub fn new(
         api_version: aziot_cert_common_http::ApiVersion,
         connector: http_common::Connector,
+        max_retries: u32,
     ) -> Self {
         let inner = connector.into_client();
-        Client { api_version, inner }
+        Client {
+            api_version,
+            inner,
+            max_retries,
+        }
     }
 
     pub async fn create_cert(
@@ -40,14 +46,15 @@ impl Client {
             }),
         };
 
-        let res: aziot_cert_common_http::get_cert::Response = http_common::request(
+        let res: aziot_cert_common_http::get_cert::Response = http_common::request_with_retry(
             &self.inner,
             http::Method::POST,
             &format!(
                 "http://certd.sock/certificates?api-version={}",
                 self.api_version
             ),
             Some(&body),
+            self.max_retries,
         )
         .await?;
         Ok(res.pem.0)
@@ -58,7 +65,7 @@ impl Client {
             pem: aziot_cert_common_http::Pem(pem.to_owned()),
         };
 
-        let res: aziot_cert_common_http::import_cert::Response = http_common::request(
+        let res: aziot_cert_common_http::import_cert::Response = http_common::request_with_retry(
             &self.inner,
             http::Method::PUT,
             &format!(
@@ -70,31 +77,34 @@ impl Client {
                 self.api_version,
             ),
             Some(&body),
+            self.max_retries,
         )
         .await?;
         Ok(res.pem.0)
     }
 
     pub async fn get_cert(&self, id: &str) -> Result<Vec<u8>, std::io::Error> {
-        let res: aziot_cert_common_http::get_cert::Response = http_common::request::<(), _>(
-            &self.inner,
-            http::Method::GET,
-            &format!(
-                "http://certd.sock/certificates/{}?api-version={}",
-                percent_encoding::percent_encode(
-                    id.as_bytes(),
-                    http_common::PATH_SEGMENT_ENCODE_SET
+        let res: aziot_cert_common_http::get_cert::Response =
+            http_common::request_with_retry::<(), _>(
+                &self.inner,
+                http::Method::GET,
+                &format!(
+                    "http://certd.sock/certificates/{}?api-version={}",
+                    percent_encoding::percent_encode(
+                        id.as_bytes(),
+                        http_common::PATH_SEGMENT_ENCODE_SET
+                    ),
+                    self.api_version,
                 ),
-                self.api_version,
-            ),
-            None,
-        )
-        .await?;
+                None,
+                self.max_retries,
+            )
+            .await?;
         Ok(res.pem.0)
     }
 
     pub async fn delete_cert(&self, id: &str) -> Result<(), std::io::Error> {
-        let () = http_common::request_no_content::<()>(
+        let () = http_common::request_no_content_with_retry::<()>(
             &self.inner,
             http::Method::DELETE,
             &format!(
@@ -106,6 +116,7 @@ impl Client {
                 self.api_version,
             ),
             None,
+            self.max_retries,
         )
         .await?;
         Ok(())

diff --git a/http-common/src/lib.rs b/http-common/src/lib.rs
@@ -31,7 +31,8 @@ pub use proxy::{get_proxy_uri, MaybeProxyConnector};
 mod request;
 #[cfg(feature = "tokio1")]
 pub use request::{
-    request, request_no_content, request_with_headers, request_with_headers_no_content,
+    request, request_no_content, request_no_content_with_retry, request_with_headers,
+    request_with_headers_no_content, request_with_retry,
 };
 
 pub mod server;