From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <d.csapak@proxmox.com> 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 334BEB9C70 for <pbs-devel@lists.proxmox.com>; Tue, 12 Dec 2023 12:32:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1AA2C336BD for <pbs-devel@lists.proxmox.com>; Tue, 12 Dec 2023 12:32:50 +0100 (CET) Received: from bookworm-dev.localdomain (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for <pbs-devel@lists.proxmox.com>; Tue, 12 Dec 2023 12:32:49 +0100 (CET) Received: by bookworm-dev.localdomain (Postfix, from userid 1000) id 28595604DC; Tue, 12 Dec 2023 12:32:48 +0100 (CET) From: Dominik Csapak <d.csapak@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Tue, 12 Dec 2023 12:32:45 +0100 Message-Id: <20231212113248.159105-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231212113248.159105-1-d.csapak@proxmox.com> References: <20231212113248.159105-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.377 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/4] tape: add optional timeout to wait_until_ready X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Tue, 12 Dec 2023 11:32:50 -0000 instead of hardcodign the default timeout as only option. This will come in handy when we need to wait for LTO9+ initialization that can take up to two hours. Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- pbs-tape/src/sg_tape.rs | 5 +++-- src/tape/drive/lto/mod.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pbs-tape/src/sg_tape.rs b/pbs-tape/src/sg_tape.rs index b28a5f27..16ef31f9 100644 --- a/pbs-tape/src/sg_tape.rs +++ b/pbs-tape/src/sg_tape.rs @@ -571,9 +571,10 @@ impl SgTape { } } - pub fn wait_until_ready(&mut self) -> Result<(), Error> { + pub fn wait_until_ready(&mut self, timeout: Option<u64>) -> Result<(), Error> { let start = SystemTime::now(); - let max_wait = std::time::Duration::new(Self::SCSI_TAPE_DEFAULT_TIMEOUT as u64, 0); + let timeout = timeout.unwrap_or(Self::SCSI_TAPE_DEFAULT_TIMEOUT as u64); + let max_wait = std::time::Duration::new(timeout, 0); loop { match self.test_unit_ready() { diff --git a/src/tape/drive/lto/mod.rs b/src/tape/drive/lto/mod.rs index 2c3a5a63..97dd540f 100644 --- a/src/tape/drive/lto/mod.rs +++ b/src/tape/drive/lto/mod.rs @@ -55,7 +55,7 @@ pub fn open_lto_tape_drive(config: &LtoTapeDrive) -> Result<LtoTapeHandle, Error } } - handle.sg_tape.wait_until_ready()?; + handle.sg_tape.wait_until_ready(None)?; handle.set_default_options()?; -- 2.39.2