From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup] tape: changer: handle missing dvcid information
Date: Thu, 22 Jul 2021 12:02:25 +0200 [thread overview]
Message-ID: <3a8e3db2-8e6a-6b23-5cba-2002cc60293f@proxmox.com> (raw)
In-Reply-To: <20210722095702.2680813-1-d.csapak@proxmox.com>
applied
On 7/22/21 11:57 AM, Dominik Csapak wrote:
> the dvcid information is not always available, so skip it if is missing
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/tape/changer/sg_pt_changer.rs | 70 ++++++++++++++++++++-----------
> 1 file changed, 45 insertions(+), 25 deletions(-)
>
> diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs
> index daa1ad82..c94eaf2e 100644
> --- a/src/tape/changer/sg_pt_changer.rs
> +++ b/src/tape/changer/sg_pt_changer.rs
> @@ -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(
> _info: &InquiryInfo,
> data: &[u8],
> @@ -733,37 +770,20 @@ fn decode_element_status_page(
>
> subhead.skip_alternate_volume_tag(&mut reader)?;
>
> - let dvcid: DvcidHead = unsafe { reader.read_be_value()? };
> -
> - let (drive_serial_number, 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),
> - };
> + let dvcid = decode_dvcid_info(&mut reader).unwrap_or(DvcidInfo {
> + vendor: None,
> + model: None,
> + serial: None,
> + });
>
> result.last_element_address = Some(desc.element_address);
>
> let drive = DriveStatus {
> loaded_slot,
> status: create_element_status(full, volume_tag),
> - drive_serial_number,
> - vendor,
> - model,
> + drive_serial_number: dvcid.serial,
> + vendor: dvcid.vendor,
> + model: dvcid.model,
> element_address: desc.element_address,
> };
> result.drives.push(drive);
prev parent reply other threads:[~2021-07-22 10:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 9:57 [pbs-devel] " Dominik Csapak
2021-07-22 10:02 ` Dietmar Maurer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3a8e3db2-8e6a-6b23-5cba-2002cc60293f@proxmox.com \
--to=dietmar@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox