From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 260C6689EA for ; Thu, 22 Jul 2021 11:57:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DF88F8DD for ; Thu, 22 Jul 2021 11:57:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6BC0AF8D4 for ; Thu, 22 Jul 2021 11:57:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3C6D441F82 for ; Thu, 22 Jul 2021 11:57:03 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 22 Jul 2021 11:57:02 +0200 Message-Id: <20210722095702.2680813-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.531 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup] tape: changer: handle missing dvcid information X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 09:57:34 -0000 the dvcid information is not always available, so skip it if is missing Signed-off-by: Dominik Csapak --- 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) -> ElementStatu } } +struct DvcidInfo { + vendor: Option, + model: Option, + serial: Option, +} + +fn decode_dvcid_info(reader: &mut R) -> Result { + 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); -- 2.30.2