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

tape: clean - fix if cleaning tape is already loaded

Browse Source
This commit is contained in:
Dietmar Maurer 2021-03-08 09:07:24 +01:00
parent d95c74c6e7
commit 9ce2481a69
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tape/changer/mod.rs
View File

@ -290,7 +290,15 @@ pub trait MediaChange {
/// This fail if there is no cleaning cartridge online. Any media /// This fail if there is no cleaning cartridge online. Any media
/// inside the drive is automatically unloaded. /// inside the drive is automatically unloaded.
fn clean_drive(&mut self) -> Result<MtxStatus, Error> { fn clean_drive(&mut self) -> Result<MtxStatus, Error> {
let status = self.status()?; let mut status = self.status()?;
// Unload drive first. Note: This also unloads a loaded cleaning tape
if let Some(drive_status) = status.drives.get(self.drive_number() as usize) {
match drive_status.status {
ElementStatus::Empty => { /* OK */ },
_ => { status = self.unload_to_free_slot(status)?; }
}
}
let mut cleaning_cartridge_slot = None; let mut cleaning_cartridge_slot = None;
@ -309,12 +317,6 @@ pub trait MediaChange {
Some(cleaning_cartridge_slot) => cleaning_cartridge_slot as u64, Some(cleaning_cartridge_slot) => cleaning_cartridge_slot as u64,
}; };
if let Some(drive_status) = status.drives.get(self.drive_number() as usize) {
match drive_status.status {
ElementStatus::Empty => { /* OK */ },
_ => { self.unload_to_free_slot(status)?; }
}
}
self.load_media_from_slot(cleaning_cartridge_slot)?; self.load_media_from_slot(cleaning_cartridge_slot)?;