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 580C5B9FEA for ; Wed, 13 Dec 2023 11:11:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2EE61883A for ; Wed, 13 Dec 2023 11:11:13 +0100 (CET) Received: from bookworm-dev.localdomain (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Wed, 13 Dec 2023 11:11:12 +0100 (CET) Received: by bookworm-dev.localdomain (Postfix, from userid 1000) id 4F7EE608A1; Wed, 13 Dec 2023 11:11:12 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 13 Dec 2023 11:11:12 +0100 Message-Id: <20231213101112.76140-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 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, changer.rs] Subject: [pbs-devel] [PATCH proxmox-backup] tape: fix 'eject-before-unload' api type 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: Wed, 13 Dec 2023 10:11:43 -0000 by converting the bool into an option, otherwise having the options not set at all will fail the unload while deserializing with 'eject-before-unload is not optional' Also if we can automatically decide this in the future, we can now detect if the option was explicitely set or not. Fixes: 66402cdc ("fix #4904: tape changer: add option to eject before unload") Signed-off-by: Dominik Csapak --- pbs-api-types/src/tape/changer.rs | 17 ++++++++++------- src/tape/changer/mod.rs | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pbs-api-types/src/tape/changer.rs b/pbs-api-types/src/tape/changer.rs index e3cf27c1..9e36b12e 100644 --- a/pbs-api-types/src/tape/changer.rs +++ b/pbs-api-types/src/tape/changer.rs @@ -39,18 +39,21 @@ Import/Export, i.e. any media in those slots are considered to be .format(&ApiStringFormat::PropertyString(&SLOT_ARRAY_SCHEMA)) .schema(); -fn is_false(b: &bool) -> bool { - !b -} - -#[api] +#[api( + properties: { + "eject-before-unload": { + optional: true, + default: false, + }, + }, +)] #[derive(Serialize, Deserialize)] #[serde(rename_all = "kebab-case")] /// Options for Changers pub struct ChangerOptions { - #[serde(default, skip_serializing_if = "is_false")] + #[serde(skip_serializing_if = "Option::is_none")] /// if set to true, tapes are ejected manually before unloading - pub eject_before_unload: bool, + pub eject_before_unload: Option, } pub const CHANGER_OPTIONS_STRING_SCHEMA: Schema = StringSchema::new("Changer options") diff --git a/src/tape/changer/mod.rs b/src/tape/changer/mod.rs index df63f6f8..9d90e29d 100644 --- a/src/tape/changer/mod.rs +++ b/src/tape/changer/mod.rs @@ -433,7 +433,7 @@ impl MediaChange for MtxMediaChanger { .parse_property_string(self.config.options.as_deref().unwrap_or_default())?, )?; - if options.eject_before_unload { + if options.eject_before_unload.unwrap_or(false) { let file = open_lto_tape_device(&self.drive.path)?; let mut handle = LtoTapeHandle::new(file)?; -- 2.39.2