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

tape: changer: handle missing dvcid information 

the dvcid information is not always available, so skip it if is missing

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-07-22 11:57:02 +02:00 committed by Dietmar Maurer
parent 131d0f10c2
commit 02631056b8
1 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/tape/changer/sg_pt_changer.rs
View File

@ -630,6 +630,43 @@ fn create_element_status(full: bool, volume_tag: Option<String>) -> ElementStatu
} }
} }
struct DvcidInfo {
vendor: Option<String>,
model: Option<String>,
serial: Option<String>,
}
fn decode_dvcid_info<R: Read>(reader: &mut R) -> Result<DvcidInfo, Error> {
let dvcid: DvcidHead = unsafe { reader.read_be_value()? };
let (serial, vendor, model) = match (dvcid.code_set, dvcid.identifier_type) {
(2, 0) => { // Serial number only (Quantum Superloader3 uses this)
let serial = reader.read_exact_allocated(dvcid.identifier_len as usize)?;
let serial = scsi_ascii_to_string(&serial);
(Some(serial), None, None)
}
(2, 1) => {
if dvcid.identifier_len != 34 {
bail!("got wrong DVCID length");
}
let vendor = reader.read_exact_allocated(8)?;
let vendor = scsi_ascii_to_string(&vendor);
let model = reader.read_exact_allocated(16)?;
let model = scsi_ascii_to_string(&model);
let serial = reader.read_exact_allocated(10)?;
let serial = scsi_ascii_to_string(&serial);
(Some(serial), Some(vendor), Some(model))
}
_ => (None, None, None),
};
Ok(DvcidInfo {
vendor,
model,
serial,
})
}
fn decode_element_status_page( fn decode_element_status_page(
_info: &InquiryInfo, _info: &InquiryInfo,
data: &[u8], data: &[u8],
@ -733,37 +770,20 @@ fn decode_element_status_page(
subhead.skip_alternate_volume_tag(&mut reader)?; subhead.skip_alternate_volume_tag(&mut reader)?;
let dvcid: DvcidHead = unsafe { reader.read_be_value()? }; let dvcid = decode_dvcid_info(&mut reader).unwrap_or(DvcidInfo {
vendor: None,
let (drive_serial_number, vendor, model) = match (dvcid.code_set, dvcid.identifier_type) { model: None,
(2, 0) => { // Serial number only (Quantum Superloader3 uses this) serial: None,
let serial = reader.read_exact_allocated(dvcid.identifier_len as usize)?; });
let serial = scsi_ascii_to_string(&serial);
(Some(serial), None, None)
}
(2, 1) => {
if dvcid.identifier_len != 34 {
bail!("got wrong DVCID length");
}
let vendor = reader.read_exact_allocated(8)?;
let vendor = scsi_ascii_to_string(&vendor);
let model = reader.read_exact_allocated(16)?;
let model = scsi_ascii_to_string(&model);
let serial = reader.read_exact_allocated(10)?;
let serial = scsi_ascii_to_string(&serial);
(Some(serial), Some(vendor), Some(model))
}
_ => (None, None, None),
};
result.last_element_address = Some(desc.element_address); result.last_element_address = Some(desc.element_address);
let drive = DriveStatus { let drive = DriveStatus {
loaded_slot, loaded_slot,
status: create_element_status(full, volume_tag), status: create_element_status(full, volume_tag),
drive_serial_number, drive_serial_number: dvcid.serial,
vendor, vendor: dvcid.vendor,
model, model: dvcid.model,
element_address: desc.element_address, element_address: desc.element_address,
}; };
result.drives.push(drive); result.drives.push(drive);