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

tape: update changer status inside ScsiMediaChange implementation

Browse Source
This commit is contained in:
Dietmar Maurer
2021-02-20 09:56:27 +01:00
parent cbd9899389
commit 3f16f1b006
3 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api2/tape/changer.rs
View File

@ -163,7 +163,6 @@ pub async fn transfer(
tokio::task::spawn_blocking(move || {
changer_config.transfer(from, to)?;
let _ = changer_config.status(false); // update status cache
Ok(())
}).await?
}

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

@ -154,11 +154,7 @@ pub fn load_media(
move |worker, config| {
task_log!(worker, "loading media '{}' into drive '{}'", label_text, drive);
let (mut changer, _) = required_media_changer(&config, &drive)?;
changer.load_media(&label_text)?;
let _ = changer.status(); // update status cache
Ok(())
changer.load_media(&label_text)
},
)?;
@ -262,11 +258,7 @@ pub fn unload(
task_log!(worker, "unloading media from drive '{}'", drive);
let (mut changer, _) = required_media_changer(&config, &drive)?;
changer.unload_media(target_slot)?;
let _ = changer.status(); // update status cache
Ok(())
changer.unload_media(target_slot)
},
)?;
@ -424,7 +416,6 @@ pub fn eject_media(
move |_worker, config| {
if let Some((mut changer, _)) = media_changer(&config, &drive)? {
changer.unload_media(None)?;
let _ = changer.status(); // update status cache
} else {
let mut drive = open_drive(&config, &drive)?;
drive.eject_media()?;
@ -867,8 +858,6 @@ pub fn update_inventory(
continue;
}
let _ = changer.status(); // update status cache
let mut drive = open_drive(&config, &drive)?;
match drive.read_label() {
Err(err) => {
@ -887,7 +876,6 @@ pub fn update_inventory(
}
}
changer.unload_media(None)?;
let _ = changer.status(); // update status cache
}
Ok(())
},