proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-08 21:22:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

verfiy: code style: inline format string variables

Browse Source 
Use a intermediate variable for the frequently used datastore name and
backup snapshod name, while it's not often the case the diff(stat)
makes a good argument that it's worth it here.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2025-02-10 11:42:18 +01:00
parent afd22455da
commit 46d4ceef77
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/backup/verify.rs
View File

@ -336,35 +336,25 @@ pub fn verify_backup_dir_with_lock(
filter: Option<&dyn Fn(&BackupManifest) -> bool>, filter: Option<&dyn Fn(&BackupManifest) -> bool>,
_snap_lock: Dir, _snap_lock: Dir,
) -> Result<bool, Error> { ) -> Result<bool, Error> {
let datastore_name = verify_worker.datastore.name();
let backup_dir_name = backup_dir.dir();
let manifest = match backup_dir.load_manifest() { let manifest = match backup_dir.load_manifest() {
Ok((manifest, _)) => manifest, Ok((manifest, _)) => manifest,
Err(err) => { Err(err) => {
info!( info!("verify {datastore_name}:{backup_dir_name} - manifest load error: {err}");
"verify {}:{} - manifest load error: {}",
verify_worker.datastore.name(),
backup_dir.dir(),
err,
);
return Ok(false); return Ok(false);
} }
}; };
if let Some(filter) = filter { if let Some(filter) = filter {
if !filter(&manifest) { if !filter(&manifest) {
info!( info!("SKIPPED: verify {datastore_name}:{backup_dir_name} (recently verified)");
"SKIPPED: verify {}:{} (recently verified)",
verify_worker.datastore.name(),
backup_dir.dir(),
);
return Ok(true); return Ok(true);
} }
} }
info!( info!("verify {datastore_name}:{backup_dir_name}");
"verify {}:{}",
verify_worker.datastore.name(),
backup_dir.dir()
);
let mut error_count = 0; let mut error_count = 0;
@ -384,11 +374,8 @@ pub fn verify_backup_dir_with_lock(
if let Err(err) = result { if let Err(err) = result {
info!( info!(
"verify {}:{}/{} failed: {}", "verify {datastore_name}:{backup_dir_name}/{file_name} failed: {err}",
verify_worker.datastore.name(), file_name = info.filename,
backup_dir.dir(),
info.filename,
err,
); );
error_count += 1; error_count += 1;
verify_result = VerifyState::Failed; verify_result = VerifyState::Failed;
@ -406,11 +393,7 @@ pub fn verify_backup_dir_with_lock(
manifest.unprotected["verify_state"] = verify_state; manifest.unprotected["verify_state"] = verify_state;
}) })
} { } {
info!( info!("verify {datastore_name}:{backup_dir_name} - manifest update error: {err}");
"verify {}:{} - manifest update error: {err}",
verify_worker.datastore.name(),
backup_dir.dir(),
);
return Ok(false); return Ok(false);
} }