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 A4D449561F for ; Wed, 18 Jan 2023 12:12:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8715E1F34A for ; Wed, 18 Jan 2023 12:12:14 +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 12:12:13 +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 49B6444704 for ; Wed, 18 Jan 2023 12:12:13 +0100 (CET) Date: Wed, 18 Jan 2023 12:12:06 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20230118104903.441554-1-c.heiss@proxmox.com> <20230118104903.441554-2-c.heiss@proxmox.com> In-Reply-To: <20230118104903.441554-2-c.heiss@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1674040304.2q5wdyw5yt.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.135 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: Re: [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 11:12:14 -0000 On January 18, 2023 11:48 am, Christoph Heiss wrote: > Groundwork for fixing #4289. This way, a backup can be set as protected > without a separate API call and thus avoid locking problems. >=20 > 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(-) >=20 > diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writ= er.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 > } >=20 > - pub async fn finish(self: Arc) -> Result<(), Error> { > + pub async fn finish(self: Arc, param: Option) -> Result= <(), Error> { > let h2 =3D self.h2.clone(); >=20 > - h2.post("finish", None) > + h2.post("finish", param) > .map_ok(move |_| { > self.abort.abort(); > }) IMHO this hunk belongs in the next patch (it's not about the endpoint, but = about the client) > 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(()) > } >=20 > + /// Sets the backup as protected. > + pub fn set_protected(&self) -> Result<(), Error> { > + let state =3D self.state.lock().unwrap(); > + state.ensure_unfinished()?; > + > + let protected_path =3D 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 =3D 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 =3D &[ > ), > ( > "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) > } >=20 > +#[sortable] > +const API_METHOD_FINISH_BACKUP: ApiMethod =3D ApiMethod::new( > + &ApiHandler::Sync(&finish_backup), > + &ObjectSchema::new( > + "Mark backup as finished.", > + &sorted!([ > + ("protected", true, &BooleanSchema::new("Mark backup as prot= ected").schema()), > + ]), > + ), > +); > + > fn finish_backup( > - _param: Value, > + param: Value, > _info: &ApiMethod, > rpcenv: &mut dyn RpcEnvironment, > ) -> Result { > let env: &BackupEnvironment =3D rpcenv.as_ref(); > + let protected =3D param["protected"].as_bool().unwrap_or(false); > + > + if protected { > + if let Err(err) =3D env.set_protected() { > + env.log(format!("failed to set backup protected: {}", err)); > + } > + } >=20 > env.finish_backup()?; > env.log("successfully finished backup"); > -- > 2.34.1 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20