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 34A1D89B78 for ; Tue, 18 Oct 2022 10:18:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DA0F26169 for ; Tue, 18 Oct 2022 10:18:10 +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 for ; Tue, 18 Oct 2022 10:18:09 +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 299CB40860 for ; Tue, 18 Oct 2022 10:18:09 +0200 (CEST) Date: Tue, 18 Oct 2022 10:18:08 +0200 From: Wolfgang Bumiller To: Dominik Csapak Cc: pbs-devel@lists.proxmox.com Message-ID: <20221018081808.rvmqljzl2pfcqtyw@casey.proxmox.com> References: <20221006113610.2764065-1-d.csapak@proxmox.com> <20221006113610.2764065-3-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221006113610.2764065-3-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.255 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [drive.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 2/4] api/tape/inventory: optionally try to restore catalogs 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: Tue, 18 Oct 2022 08:18:40 -0000 On Thu, Oct 06, 2022 at 01:36:08PM +0200, Dominik Csapak wrote: > in a disaster recovery case, it is useful to not only re-invetorize > the labels + media-sets, but also to try to recover the catalogs > from the tape (to know whats on there). This adds an option to > the inventory api call that tries to do a fast catalog restore > from each tape to be inventorized. > > Signed-off-by: Dominik Csapak > --- > src/api2/tape/drive.rs | 41 +++++++++++++++++++++++++++++++++++------ > 1 file changed, 35 insertions(+), 6 deletions(-) > > diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs > index 28c0f0f5..3394afe9 100644 > --- a/src/api2/tape/drive.rs > +++ b/src/api2/tape/drive.rs > @@ -848,6 +848,13 @@ pub async fn inventory(drive: String) -> Result, Error> { > "read-all-labels": { > description: "Load all tapes and try read labels (even if already inventoried)", > type: bool, > + default: false, > + optional: true, > + }, > + "catalog": { > + description: "Restore the catalog from tape.", > + type: bool, > + default: false, > optional: true, If we're adding default+optional here... > }, > }, > @@ -867,10 +874,13 @@ pub async fn inventory(drive: String) -> Result, Error> { > /// then loads any unknown media into the drive, reads the label, and > /// store the result to the media database. > /// > +/// If `catalog` is true, also tries to restore the catalog from tape. > +/// > /// Note: This updates the media online status. > pub fn update_inventory( > drive: String, > read_all_labels: Option, > + catalog: Option, ...let's just drop the `Option` bit here in both parameters... > rpcenv: &mut dyn RpcEnvironment, > ) -> Result { > let upid_str = run_drive_worker( > @@ -889,6 +899,8 @@ pub fn update_inventory( > let mut inventory = Inventory::load(TAPE_STATUS_DIR)?; > > update_changer_online_status(&config, &mut inventory, &changer_name, &label_text_list)?; > + let catalog = catalog.unwrap_or(false); > + let read_all_labels = read_all_labels.unwrap_or(false); ... Then we don't need to repeat (and potentially mess up in the future) the defaults here. ^