sdgoij/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-01-17 09:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #459 from rustfs/fix/linux-error-handling

Browse Source 
fix: resolve duplicate Error import and ParseIntError
This commit is contained in:
loverustfs
2025-06-10 22:16:08 +08:00
committed by GitHub
parent 8a81c3d95d 4252377249
commit 682ad8742d
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
crates/utils/src/os/linux.rs
View File

@@ -18,30 +18,24 @@ pub fn get_info(p: impl AsRef<Path>) -> std::io::Result<DiskInfo> {
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()
)));
}
};
@@ -49,15 +43,12 @@ pub fn get_info(p: impl AsRef<Path>) -> std::io::Result<DiskInfo> {
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()
)));
}
};

7
ecstore/src/utils/os/linux.rs
View File

@@ -1,11 +1,10 @@
use nix::sys::stat::{self, stat};
use nix::sys::statfs::{self, FsType, statfs};
use std::fs::File;
use std::io::{self, BufRead, Error, ErrorKind};
use std::io::{self, BufRead, Error, ErrorKind, Result};
use std::path::Path;
use crate::disk::Info;
use std::io::{Error, Result};
use super::IOStats;
@@ -163,7 +162,9 @@ fn read_stat(file_name: &str) -> Result<Vec<u64>> {
// 分割行并解析为 u64
// https://rust-lang.github.io/rust-clippy/master/index.html#trim_split_whitespace
for token in line.split_whitespace() {
let ui64: u64 = token.parse()?;
let ui64: u64 = token
.parse()
.map_err(|e| Error::new(ErrorKind::InvalidData, format!("Failed to parse token '{}': {}", token, e)))?;
stats.push(ui64);
}
}