Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mention inodes on fatal ENOSPC errors. #793

Merged
merged 1 commit into from
Oct 5, 2022
Merged

Mention inodes on fatal ENOSPC errors. #793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 45 additions & 15 deletions src/utils/fatal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// `std::fs` that instead of returning `std::io::Error` log that error and
/// return our own [`Failed`] instead.

use std::{fs, io};
use std::{fmt, fs, io};
use std::ffi::{OsStr, OsString};
use std::fs::{File, Metadata};
use std::path::{Path, PathBuf};
Expand Down Expand Up @@ -89,7 +89,7 @@ impl<'a> Iterator for ReadDir<'a> {
Err(err) => {
error!(
"Fatal: failed to read directory {}: {}",
self.path.display(), err
self.path.display(), IoErrorDisplay(err)
);
return Some(Err(Failed))
}
Expand All @@ -99,7 +99,7 @@ impl<'a> Iterator for ReadDir<'a> {
Err(err) => {
error!(
"Fatal: failed to read directory {}: {}",
self.path.display(), err
self.path.display(), IoErrorDisplay(err)
);
return Some(Err(Failed))
}
Expand All @@ -122,7 +122,7 @@ pub fn read_dir(path: &Path) -> Result<ReadDir, Failed> {
Err(err) => {
error!(
"Fatal: failed to open directory {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Err(Failed)
}
Expand All @@ -142,7 +142,7 @@ pub fn read_existing_dir(path: &Path) -> Result<Option<ReadDir>, Failed> {
Err(err) => {
error!(
"Fatal: failed to open directory {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Err(Failed)
}
Expand All @@ -157,7 +157,7 @@ pub fn create_dir_all(path: &Path) -> Result<(), Failed> {
fs::create_dir_all(path).map_err(|err| {
error!(
"Fatal: failed to create directory {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Failed
})
Expand All @@ -172,7 +172,7 @@ pub fn create_parent_all(path: &Path) -> Result<(), Failed> {
fs::create_dir_all(path).map_err(|err| {
error!(
"Fatal: failed to create directory {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Failed
})?
Expand All @@ -189,7 +189,7 @@ pub fn remove_dir_all(path: &Path) -> Result<(), Failed> {
if err.kind() != io::ErrorKind::NotFound {
error!(
"Fatal: failed to remove directory tree {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
return Err(Failed)
}
Expand All @@ -208,7 +208,7 @@ pub fn remove_file(path: &Path) -> Result<(), Failed> {
if err.kind() != io::ErrorKind::NotFound {
error!(
"Fatal: failed to remove file {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
return Err(Failed)
}
Expand Down Expand Up @@ -239,7 +239,7 @@ pub fn rename(source: &Path, target: &Path) -> Result<(), Failed> {
fs::rename(source, target).map_err(|err| {
error!(
"Fatal: failed to move {} to {}: {}",
source.display(), target.display(), err
source.display(), target.display(), IoErrorDisplay(err)
);
Failed
})
Expand All @@ -255,7 +255,7 @@ pub fn open_file(path: &Path) -> Result<File, Failed> {
File::open(path).map_err(|err| {
error!(
"Fatal: failed to open file {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Failed
})
Expand All @@ -271,7 +271,7 @@ pub fn read_file(path: &Path) -> Result<Vec<u8>, Failed> {
fs::read(path).map_err(|err| {
error!(
"Fatal: failed to read file {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Failed
})
Expand All @@ -291,7 +291,7 @@ pub fn read_existing_file(path: &Path) -> Result<Option<Vec<u8>>, Failed> {
Err(err) => {
error!(
"Fatal: failed to read file {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Err(Failed)
}
Expand All @@ -309,7 +309,7 @@ pub fn write_file(path: &Path, contents: &[u8]) -> Result<(), Failed> {
fs::write(path, contents).map_err(|err| {
error!(
"Fatal: failed to write file {}: {}",
path.display(), err
path.display(), IoErrorDisplay(err)
);
Failed
})
Expand All @@ -332,7 +332,7 @@ pub fn copy_dir_all(source: &Path, target: &Path) -> Result<(), Failed> {
) {
error!(
"Fatal: failed to copy {}: {}",
entry.path().display(), err
entry.path().display(), IoErrorDisplay(err)
);
return Err(Failed)
}
Expand All @@ -347,3 +347,33 @@ pub fn copy_dir_all(source: &Path, target: &Path) -> Result<(), Failed> {
Ok(())
}


//------------ IoErrorDisplay ------------------------------------------------

struct IoErrorDisplay(io::Error);

#[cfg(unix)]
impl fmt::Display for IoErrorDisplay {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use nix::errno::Errno;

if matches!(
self.0.raw_os_error().map(Errno::from_i32),
Some(Errno::ENOSPC)
) {
f.write_str("No space or inodes left on device")
}
else {
self.0.fmt(f)
}
}
}


#[cfg(not(unix))]
impl fmt::Display for IoErrorDisplay {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.0.fmt(f)
}
}