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

api: tape restore: some code cleanups 

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-06-05 16:55:13 +02:00
parent 2ad96e1635
commit f31e32a006
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api2/tape/restore.rs
View File

@ -537,9 +537,8 @@ fn check_snapshot_restorable(
) -> Result<bool, Error> { ) -> Result<bool, Error> {
let (datastore, namespaces) = if required { let (datastore, namespaces) = if required {
let (datastore, namespaces) = match store_map.get_targets(store, ns) { let (datastore, namespaces) = match store_map.get_targets(store, ns) {
Some((target_ds, target_ns)) => { Some((target_ds, Some(target_ns))) => (target_ds, target_ns),
(target_ds, target_ns.unwrap_or_else(|| vec![ns.clone()])) Some((target_ds, None)) => (target_ds, vec![ns.clone()]),
}
None => bail!("could not find target datastore for {store}:{snapshot}"), None => bail!("could not find target datastore for {store}:{snapshot}"),
}; };
if namespaces.is_empty() { if namespaces.is_empty() {
@ -551,8 +550,7 @@ fn check_snapshot_restorable(
match store_map.get_targets(store, ns) { match store_map.get_targets(store, ns) {
Some((_, Some(ns))) if ns.is_empty() => return Ok(false), Some((_, Some(ns))) if ns.is_empty() => return Ok(false),
Some((datastore, Some(ns))) => (datastore, ns), Some((datastore, Some(ns))) => (datastore, ns),
Some((_, None)) => return Ok(false), Some((_, None)) | None => return Ok(false),
None => return Ok(false),
} }
}; };
@ -699,9 +697,11 @@ fn restore_list_worker(
}) })
.collect() .collect()
}; };
for (store, snapshot, ns, _) in snapshots.iter() { for (store, snapshot, _ns, _) in snapshots.iter() {
// unwrap ok, we already checked those snapshots let datastore = match store_map.get_targets(store, &ns) {
let (datastore, _) = store_map.get_targets(store, &ns).unwrap(); Some(store, _) => store,
_ => bail!("unexpected error"), // we already checked those
};
let (media_id, file_num) = let (media_id, file_num) =
if let Some((media_uuid, file_num)) = catalog.lookup_snapshot(store, &snapshot) { if let Some((media_uuid, file_num)) = catalog.lookup_snapshot(store, &snapshot) {
let media_id = inventory.lookup_media(media_uuid).unwrap(); let media_id = inventory.lookup_media(media_uuid).unwrap();