DOSE-1083 Cleanup the error message generated by test_connectivity (o…

…penzfs#261)
mmaybee · Mar 1, 2022 · e8a58ed · e8a58ed
1 parent 711fb9c
commit e8a58ed
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 9 deletions.
diff --git a/cmd/zfs_object_agent/Cargo.lock b/cmd/zfs_object_agent/Cargo.lock
diff --git a/cmd/zfs_object_agent/zettaobject/Cargo.toml b/cmd/zfs_object_agent/zettaobject/Cargo.toml
@@ -41,6 +41,7 @@ semver = "1.0.4"
 serde = { version = "1.0.125", features = ["derive"] }
 serde_bytes = "0.11"
 serde_json = "1.0.64"
+serde-xml-rs = "0.5.1"
 stream-reduce = "0.1.0"
 tokio = { version = "1.4", features = ["full"] }
 tokio-stream = "0.1.5"

diff --git a/cmd/zfs_object_agent/zettaobject/src/test_connectivity.rs b/cmd/zfs_object_agent/zettaobject/src/test_connectivity.rs
@@ -1,25 +1,61 @@
-use crate::{ObjectAccess, ObjectAccessOpType};
+use crate::{OAError, ObjectAccess, ObjectAccessOpType};
 use rand::Rng;
+use rusoto_core::RusotoError;
+use serde::Deserialize;
 use std::time::Duration;
 
+#[derive(Debug, Deserialize)]
+struct Error {
+    #[serde(rename = "Code")]
+    code: String,
+    #[serde(rename = "Message")]
+    message: String,
+}
+
 // Test by writing and deleting an object.
-async fn do_test_connectivity(object_access: &ObjectAccess) -> anyhow::Result<()> {
+async fn do_test_connectivity(object_access: &ObjectAccess) -> Result<(), String> {
     let num: u64 = rand::thread_rng().gen();
     let file = format!("test/test_connectivity_{}", num);
     let content = "test connectivity to S3".as_bytes().to_vec();
 
-    object_access
+    match object_access
         .put_object_timed(
             file.clone(),
             content.into(),
             ObjectAccessOpType::MetadataPut,
             Some(Duration::from_secs(30)),
         )
-        .await?;
-
-    object_access.delete_object(file).await;
-
-    Ok(())
+        .await
+    {
+        Err(OAError::RequestError(RusotoError::Unknown(bhr))) => {
+            match serde_xml_rs::from_str::<Error>(bhr.body_as_str()) {
+                Ok(error) => Err(format!(
+                    "Connectivity test failed: {}: {}",
+                    error.code, error.message
+                )),
+                Err(_) => {
+                    // If the error string can not be deserialized as xml, return the enterity of the error back.
+                    Err(format!("Connectivity test failed: {}", bhr.body_as_str()))
+                }
+            }
+        }
+        Err(OAError::TimeoutError(_)) => {
+            Err("Connectivity test failed with a timeout.".to_string())
+        }
+        Err(OAError::RequestError(RusotoError::Service(err))) => Err(format!(
+            "Connectivity test failed due to a service error: {}",
+            err
+        )),
+        Err(OAError::RequestError(RusotoError::Credentials(err))) => Err(format!(
+            "Connectivity test failed due to a credentials error: {}",
+            err
+        )),
+        Err(err) => Err(format!("Connectivity test failed: {}", err)),
+        Ok(_) => {
+            object_access.delete_object(file).await;
+            Ok(())
+        }
+    }
 }
 
 pub fn test_connectivity(
@@ -52,7 +88,7 @@ pub fn test_connectivity(
 
             std::process::exit(match do_test_connectivity(&object_access).await {
                 Err(err) => {
-                    eprintln!("Connectivity test failed: {}", err);
+                    eprintln!("{}", err);
                     1
                 }
                 Ok(_) => {