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 689ED933AD for ; Fri, 16 Sep 2022 12:36:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5D60822946 for ; Fri, 16 Sep 2022 12:35:50 +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 ; Fri, 16 Sep 2022 12:35:49 +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 3B2B84447D for ; Fri, 16 Sep 2022 12:35:49 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 16 Sep 2022 12:35:35 +0200 Message-Id: <20220916103535.103013-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220916103535.103013-1-f.gruenbichler@proxmox.com> References: <20220916103535.103013-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.150 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. [mirror.rs] Subject: [pve-devel] [PATCH proxmox-offline-mirror 3/3] cli: add `mirror snapshot create-all` command X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Sep 2022 10:36:20 -0000 that creates a new snapshot for each configured mirror, collecting the results and printing a summary at the end. this should be suitable for usage in a cron job or timer-triggered unit, with no output on stderr for 100% OK execution runs. Signed-off-by: Fabian Grünbichler --- src/bin/proxmox_offline_mirror_cmds/mirror.rs | 78 ++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/src/bin/proxmox_offline_mirror_cmds/mirror.rs b/src/bin/proxmox_offline_mirror_cmds/mirror.rs index 4503971..3094146 100644 --- a/src/bin/proxmox_offline_mirror_cmds/mirror.rs +++ b/src/bin/proxmox_offline_mirror_cmds/mirror.rs @@ -1,8 +1,9 @@ -use anyhow::{format_err, Error}; +use anyhow::{bail, format_err, Error}; use proxmox_section_config::SectionConfigData; use proxmox_subscription::SubscriptionStatus; use serde_json::Value; +use std::collections::HashMap; use proxmox_router::cli::{ format_and_print_result, get_output_format, CliCommand, CliCommandMap, CommandLineInterface, @@ -89,6 +90,80 @@ async fn create_snapshot( Ok(()) } +#[api( + input: { + properties: { + config: { + type: String, + optional: true, + description: "Path to mirroring config file.", + }, + "dry-run": { + type: bool, + optional: true, + default: false, + description: "Only fetch indices and print summary of missing package files, don't store anything.", + } + }, + }, + )] +/// Create a new repository snapshot for each configured mirror, fetching required/missing files +/// from original repository. +async fn create_snapshots( + config: Option, + dry_run: bool, + _param: Value, +) -> Result<(), Error> { + let config = config.unwrap_or_else(get_config_path); + + let (section_config, _digest) = proxmox_offline_mirror::config::config(&config)?; + let mirrors: Vec = section_config.convert_to_typed_array("mirror")?; + + let mut results = HashMap::new(); + + for mirror in mirrors { + let mirror_id = mirror.id.clone(); + println!("\nCREATING SNAPSHOT FOR '{mirror_id}'.."); + let subscription = match get_subscription_key(§ion_config, &mirror) { + Ok(opt_key) => opt_key, + Err(err) => { + eprintln!("Skipping mirror '{mirror_id}' - {err})"); + results.insert(mirror_id, Err(err)); + continue; + } + }; + let res = proxmox_offline_mirror::mirror::create_snapshot( + mirror, + &Snapshot::now(), + subscription, + dry_run, + ); + if let Err(err) = &res { + eprintln!("Failed to create snapshot for '{mirror_id}' - {err}"); + } + + results.insert(mirror_id, res); + } + + println!("\nSUMMARY:"); + for (mirror_id, _res) in results.iter().filter(|(_, res)| res.is_ok()) { + println!("{mirror_id}: OK"); // TODO update once we have a proper return value + } + + let mut fail = false; + + for (mirror_id, res) in results.into_iter().filter(|(_, res)| res.is_err()) { + fail = true; + eprintln!("{mirror_id}: ERR - {}", res.unwrap_err()); + } + + if fail { + bail!("Failed to create snapshots for all configured mirrors."); + } + + Ok(()) +} + #[api( input: { properties: { @@ -204,6 +279,7 @@ pub fn mirror_commands() -> CommandLineInterface { "create", CliCommand::new(&API_METHOD_CREATE_SNAPSHOT).arg_param(&["id"]), ) + .insert("create-all", CliCommand::new(&API_METHOD_CREATE_SNAPSHOTS)) .insert( "list", CliCommand::new(&API_METHOD_LIST_SNAPSHOTS).arg_param(&["id"]), -- 2.30.2