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 DC60296837 for ; Wed, 25 Jan 2023 13:19:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AFB7BF944 for ; Wed, 25 Jan 2023 13:19:28 +0100 (CET) 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 ; Wed, 25 Jan 2023 13:19:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BA1E24615B for ; Wed, 25 Jan 2023 13:19:27 +0100 (CET) From: Christoph Heiss To: pbs-devel@lists.proxmox.com Date: Wed, 25 Jan 2023 13:18:57 +0100 Message-Id: <20230125121902.404950-3-c.heiss@proxmox.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230125121902.404950-1-c.heiss@proxmox.com> References: <20230125121902.404950-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 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 RCVD_IN_DNSWL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. 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. [mod.rs, environment.rs] Subject: [pbs-devel] [RFC PATCH v2 proxmox-backup 2/7] api2: Add `protected` parameter to `finish` endpoint 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, 25 Jan 2023 12:19:58 -0000 Groundwork for fixing #4289. This way, a backup can be set as protected without a separate API call and thus avoid locking problems. Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * Moved BackupWriter::finish adaption to patch 2 src/api2/backup/environment.rs | 11 +++++++++++ src/api2/backup/mod.rs | 30 ++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index 4f07f9b4..05ee12ea 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -590,6 +590,17 @@ impl BackupEnvironment { Ok(()) } + /// Sets the backup as protected. + pub fn set_protected(&self) -> Result<(), Error> { + let state = self.state.lock().unwrap(); + state.ensure_unfinished()?; + + let protected_path = self.backup_dir.protected_file(); + std::fs::File::create(protected_path) + .map(|_| ()) + .map_err(|err| format_err!("could not create protection file: {}", err)) + } + /// Mark backup as finished pub fn finish_backup(&self) -> Result<(), Error> { let mut state = self.state.lock().unwrap(); diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs index 90e2ea7e..757364b6 100644 --- a/src/api2/backup/mod.rs +++ b/src/api2/backup/mod.rs @@ -342,13 +342,7 @@ const BACKUP_API_SUBDIRS: SubdirMap = &[ .post(&API_METHOD_CREATE_DYNAMIC_INDEX) .put(&API_METHOD_DYNAMIC_APPEND), ), - ( - "finish", - &Router::new().post(&ApiMethod::new( - &ApiHandler::Sync(&finish_backup), - &ObjectSchema::new("Mark backup as finished.", &[]), - )), - ), + ("finish", &Router::new().post(&API_METHOD_FINISH_BACKUP)), ( "fixed_chunk", &Router::new().upload(&API_METHOD_UPLOAD_FIXED_CHUNK), @@ -771,12 +765,32 @@ fn close_fixed_index( Ok(Value::Null) } +#[sortable] +const API_METHOD_FINISH_BACKUP: ApiMethod = ApiMethod::new( + &ApiHandler::Sync(&finish_backup), + &ObjectSchema::new( + "Mark backup as finished.", + &sorted!([( + "protected", + true, + &BooleanSchema::new("Mark backup as protected").schema() + ),]), + ), +); + fn finish_backup( - _param: Value, + param: Value, _info: &ApiMethod, rpcenv: &mut dyn RpcEnvironment, ) -> Result { let env: &BackupEnvironment = rpcenv.as_ref(); + let protected = param["protected"].as_bool().unwrap_or(false); + + if protected { + if let Err(err) = env.set_protected() { + env.log(format!("failed to set backup protected: {}", err)); + } + } env.finish_backup()?; env.log("successfully finished backup"); -- 2.34.1