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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5D6F368921 for ; Thu, 22 Jul 2021 11:05:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 53DE0F16E for ; Thu, 22 Jul 2021 11:05:25 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 96F6FF15B for ; Thu, 22 Jul 2021 11:05:24 +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 5F7FD4255F for ; Thu, 22 Jul 2021 11:05:24 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 22 Jul 2021 11:05:23 +0200 Message-Id: <20210722090523.1999546-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210722090523.1999546-1-d.csapak@proxmox.com> References: <20210722090523.1999546-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.536 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 v3 2/2] tape: changer: improve error message on wrong counts 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:05:25 -0000 Signed-off-by: Dominik Csapak --- src/tape/changer/sg_pt_changer.rs | 37 ++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs index ddbb5d74..6abaac99 100644 --- a/src/tape/changer/sg_pt_changer.rs +++ b/src/tape/changer/sg_pt_changer.rs @@ -421,17 +421,38 @@ pub fn read_element_status(file: &mut F) -> Result let page = get_element(&inquiry, &mut sg_raw, ElementType::MediumTransport, allocation_len, false)?; transports.extend(page.transports); - if (setup.transport_element_count as usize) != transports.len() { - bail!("got wrong number of transport elements"); + let transport_count = setup.transport_element_count as usize; + let storage_count = setup.storage_element_count as usize; + let import_export_count = setup.import_export_element_count as usize; + let transfer_count = setup.transfer_element_count as usize; + + if transport_count != transports.len() { + bail!( + "got wrong number of transport elements: expoected {}, got{}", + transport_count, + transports.len() + ); } - if (setup.storage_element_count as usize) != storage_slots.len() { - bail!("got wrong number of storage elements"); + if storage_count != storage_slots.len() { + bail!( + "got wrong number of storage elements: expected {}, got {}", + storage_count, + storage_slots.len(), + ); } - if (setup.import_export_element_count as usize) != import_export_slots.len() { - bail!("got wrong number of import/export elements"); + if import_export_count != import_export_slots.len() { + bail!( + "got wrong number of import/export elements: expected {}, got {}", + import_export_count, + import_export_slots.len(), + ); } - if (setup.transfer_element_count as usize) != drives.len() { - bail!("got wrong number of transfer elements"); + if transfer_count != drives.len() { + bail!( + "got wrong number of transfer elements: expected {}, got {}", + transfer_count, + drives.len(), + ); } // create same virtual slot order as mtx(1) -- 2.30.2