From: Christoph Heiss <c.heiss@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC PATCH v2 proxmox-backup 2/7] api2: Add `protected` parameter to `finish` endpoint
Date: Wed, 25 Jan 2023 13:18:57 +0100 [thread overview]
Message-ID: <20230125121902.404950-3-c.heiss@proxmox.com> (raw)
In-Reply-To: <20230125121902.404950-1-c.heiss@proxmox.com>
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 <c.heiss@proxmox.com>
---
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<Value, Error> {
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
next prev parent reply other threads:[~2023-01-25 12:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 12:18 [pbs-devel] [RFC PATCH v2 proxmox-backup{, -qemu}, pve-{qemu, manager}, qemu-server 0/7] fix #4289: Set protected flag on backup creation Christoph Heiss
2023-01-25 12:18 ` [pbs-devel] [RFC PATCH v2 proxmox-backup 1/7] api2: Introduce server features discovery mechanism Christoph Heiss
2023-01-25 15:56 ` Thomas Lamprecht
2023-01-26 12:33 ` Christoph Heiss
2023-01-25 12:18 ` Christoph Heiss [this message]
2023-01-25 12:18 ` [pbs-devel] [RFC PATCH v2 proxmox-backup 3/3] client: Add `--protected` CLI flag to backup command Christoph Heiss
2023-01-25 12:18 ` [pbs-devel] [RFC PATCH v2 proxmox-backup-qemu 4/7] api: Supply `protected` parameter to the `finish` API call Christoph Heiss
2023-01-25 12:19 ` [pbs-devel] [RFC PATCH v2 pve-qemu 5/7] pve: Add patch to support new proxmox-backup-qemu API Christoph Heiss
2023-01-25 12:19 ` [pbs-devel] [RFC PATCH v2 qemu-server 6/7] vzdump: Set protected flag on backup start if supported Christoph Heiss
2023-01-25 12:19 ` [pbs-devel] [RFC PATCH v2 pve-manager 7/7] vzdump: Only set protected attribute if not already done Christoph Heiss
2023-01-25 16:00 ` [pbs-devel] [RFC PATCH v2 proxmox-backup{, -qemu}, pve-{qemu, manager}, qemu-server 0/7] fix #4289: Set protected flag on backup creation Thomas Lamprecht
2023-01-26 12:44 ` Christoph Heiss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230125121902.404950-3-c.heiss@proxmox.com \
--to=c.heiss@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox