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 C0064954FA for ; Wed, 18 Jan 2023 11:50:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9E99C1EAF0 for ; Wed, 18 Jan 2023 11:49:53 +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, 18 Jan 2023 11:49:52 +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 A124644EC5 for ; Wed, 18 Jan 2023 11:49:52 +0100 (CET) From: Christoph Heiss To: pbs-devel@lists.proxmox.com Date: Wed, 18 Jan 2023 11:48:58 +0100 Message-Id: <20230118104903.441554-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230118104903.441554-1-c.heiss@proxmox.com> References: <20230118104903.441554-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 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 Subject: [pbs-devel] [RFC PATCH proxmox-backup 1/6] 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, 18 Jan 2023 10:50:23 -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 --- pbs-client/src/backup_writer.rs | 4 ++-- src/api2/backup/environment.rs | 11 +++++++++++ src/api2/backup/mod.rs | 25 ++++++++++++++++++++----- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs index be6da2a6..3e4b4878 100644 --- a/pbs-client/src/backup_writer.rs +++ b/pbs-client/src/backup_writer.rs @@ -165,10 +165,10 @@ impl BackupWriter { self.h2.upload("PUT", path, param, content_type, data).await } - pub async fn finish(self: Arc) -> Result<(), Error> { + pub async fn finish(self: Arc, param: Option) -> Result<(), Error> { let h2 = self.h2.clone(); - h2.post("finish", None) + h2.post("finish", param) .map_ok(move |_| { self.abort.abort(); }) 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..decad084 100644 --- a/src/api2/backup/mod.rs +++ b/src/api2/backup/mod.rs @@ -344,10 +344,7 @@ const BACKUP_API_SUBDIRS: SubdirMap = &[ ), ( "finish", - &Router::new().post(&ApiMethod::new( - &ApiHandler::Sync(&finish_backup), - &ObjectSchema::new("Mark backup as finished.", &[]), - )), + &Router::new().post(&API_METHOD_FINISH_BACKUP), ), ( "fixed_chunk", @@ -771,12 +768,30 @@ 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