improve comment and error

ecstore/src/disk/local.rs

@@ -1193,15 +1193,15 @@ impl DiskAPI for LocalDisk {
 
     #[tracing::instrument(skip(self))]
     async fn set_disk_id(&self, id: Option<Uuid>) -> Result<()> {
-        // 本地不需要设置
+        // No setup is required locally
         // TODO: add check_id_store
         let mut format_info = self.format_info.write().await;
         format_info.id = id;
         Ok(())
     }
 
-    #[must_use]
     #[tracing::instrument(skip(self))]
+    #[must_use]
     async fn read_all(&self, volume: &str, path: &str) -> Result<Vec<u8>> {
         if volume == super::RUSTFS_META_BUCKET && path == super::FORMAT_CONFIG_FILE {
             let format_info = self.format_info.read().await;

ecstore/src/io.rs

@@ -58,7 +58,7 @@ impl HttpFileWriter {
                 .body(body)
                 .send()
                 .await
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+                .map_err(io::Error::other)
             {
                 error!("HttpFileWriter put file err: {:?}", err);
 
@@ -115,9 +115,9 @@ impl HttpFileReader {
             ))
             .send()
             .await
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+            .map_err(io::Error::other)?;
 
-        let inner = Box::new(StreamReader::new(resp.bytes_stream().map_err(std::io::Error::other)));
+        let inner = Box::new(StreamReader::new(resp.bytes_stream().map_err(io::Error::other)));
 
         Ok(Self { inner })
     }

ecstore/src/utils/os/unix.rs

@@ -2,7 +2,7 @@ use super::IOStats;
 use crate::disk::Info;
 use common::error::Result;
 use nix::sys::{stat::stat, statfs::statfs};
-use std::io::{Error, ErrorKind};
+use std::io::Error;
 use std::path::Path;
 
 /// returns total and free bytes available in a directory, e.g. `/`.
@@ -17,30 +17,24 @@ pub fn get_info(p: impl AsRef<Path>) -> std::io::Result<Info> {
     let reserved = match bfree.checked_sub(bavail) {
         Some(reserved) => reserved,
         None => {
-            return Err(Error::new(
-                ErrorKind::Other,
-                format!(
-                    "detected f_bavail space ({}) > f_bfree space ({}), fs corruption at ({}). please run 'fsck'",
-                    bavail,
-                    bfree,
-                    p.as_ref().display()
-                ),
-            ))
+            return Err(Error::other(format!(
+                "detected f_bavail space ({}) > f_bfree space ({}), fs corruption at ({}). please run 'fsck'",
+                bavail,
+                bfree,
+                p.as_ref().display()
+            )))
         }
     };
 
     let total = match blocks.checked_sub(reserved) {
         Some(total) => total * bsize,
         None => {
-            return Err(Error::new(
-                ErrorKind::Other,
-                format!(
-                    "detected reserved space ({}) > blocks space ({}), fs corruption at ({}). please run 'fsck'",
-                    reserved,
-                    blocks,
-                    p.as_ref().display()
-                ),
-            ))
+            return Err(Error::other(format!(
+                "detected reserved space ({}) > blocks space ({}), fs corruption at ({}). please run 'fsck'",
+                reserved,
+                blocks,
+                p.as_ref().display()
+            )))
         }
     };
 
@@ -48,15 +42,12 @@ pub fn get_info(p: impl AsRef<Path>) -> std::io::Result<Info> {
     let used = match total.checked_sub(free) {
         Some(used) => used,
         None => {
-            return Err(Error::new(
-                ErrorKind::Other,
-                format!(
-                    "detected free space ({}) > total drive space ({}), fs corruption at ({}). please run 'fsck'",
-                    free,
-                    total,
-                    p.as_ref().display()
-                ),
-            ))
+            return Err(Error::other(format!(
+                "detected free space ({}) > total drive space ({}), fs corruption at ({}). please run 'fsck'",
+                free,
+                total,
+                p.as_ref().display()
+            )))
         }
     };