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 036E79132B for ; Thu, 6 Oct 2022 13:36:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DD64D1C022 for ; Thu, 6 Oct 2022 13:36:12 +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 for ; Thu, 6 Oct 2022 13:36:11 +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 8A72744295 for ; Thu, 6 Oct 2022 13:36:11 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 6 Oct 2022 13:36:09 +0200 Message-Id: <20221006113610.2764065-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221006113610.2764065-1-d.csapak@proxmox.com> References: <20221006113610.2764065-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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. [proxmox-tape.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 3/4] proxmox-tape: add 'catalog' option to 'proxmox-tape inventory' 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, 06 Oct 2022 11:36:13 -0000 Signed-off-by: Dominik Csapak --- src/bin/proxmox-tape.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/bin/proxmox-tape.rs b/src/bin/proxmox-tape.rs index 9cb3978f..5508dfc5 100644 --- a/src/bin/proxmox-tape.rs +++ b/src/bin/proxmox-tape.rs @@ -444,6 +444,12 @@ async fn read_label(mut param: Value) -> Result<(), Error> { type: bool, optional: true, }, + "catalog": { + description: "Try to restore catalogs from tapes.", + type: bool, + default: false, + optional: true, + } }, }, )] @@ -451,6 +457,7 @@ async fn read_label(mut param: Value) -> Result<(), Error> { async fn inventory( read_labels: Option, read_all_labels: Option, + catalog: Option, mut param: Value, ) -> Result<(), Error> { let output_format = extract_output_format(&mut param); @@ -458,7 +465,9 @@ async fn inventory( let (config, _digest) = pbs_config::drive::config()?; let drive = extract_drive_name(&mut param, &config)?; - let do_read = read_labels.unwrap_or(false) || read_all_labels.unwrap_or(false); + let read_all_labels = read_all_labels.unwrap_or(false); + let catalog = catalog.unwrap_or(false); + let do_read = read_labels.unwrap_or(false) || read_all_labels || catalog; let client = connect_to_localhost()?; @@ -466,9 +475,8 @@ async fn inventory( if do_read { let mut param = json!({}); - if let Some(true) = read_all_labels { - param["read-all-labels"] = true.into(); - } + param["read-all-labels"] = read_all_labels.into(); + param["catalog"] = catalog.into(); let result = client.put(&path, Some(param)).await?; // update inventory view_task_result(&client, result, &output_format).await?; -- 2.30.2