tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rework GC traversal error handling

Browse Source 
the error message don't make sense with an empty default

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-01-20 17:23:53 +01:00 committed by Wolfgang Bumiller
parent 3e461dec1c
commit d08cff51a4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backup/datastore.rs
View File

@ -395,16 +395,18 @@ impl DataStore {
} }
let handle_entry_err = |err: walkdir::Error| { let handle_entry_err = |err: walkdir::Error| {
if let Some(inner) = err.io_error() { if let Some(inner) = err.io_error() {
let path = err.path().unwrap_or(Path::new("")); if let Some(path) = err.path() {
match inner.kind() { if inner.kind() == io::ErrorKind::PermissionDenied {
io::ErrorKind::PermissionDenied => {
// only allow to skip ext4 fsck directory, avoid GC if, for example, // only allow to skip ext4 fsck directory, avoid GC if, for example,
// a user got file permissions wrong on datastore rsync to new server // a user got file permissions wrong on datastore rsync to new server
if err.depth() > 1 || !path.ends_with("lost+found") { if err.depth() > 1 || !path.ends_with("lost+found") {
bail!("cannot continue garbage-collection safely, permission denied on: {}", path.display()) bail!("cannot continue garbage-collection safely, permission denied on: {:?}", path)
} }
}, } else {
_ => bail!("unexpected error on datastore traversal: {} - {}", inner, path.display()), bail!("unexpected error on datastore traversal: {} - {:?}", inner, path)
}
} else {
bail!("unexpected error on datastore traversal: {}", inner)
} }
} }
Ok(()) Ok(())