From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v2 24/43] api: backup: provide retain-until timestamp for extended prune protection
Date: Fri, 6 Nov 2026 18:22:16 +0100 [thread overview]
Message-ID: <20261106172235.890542-25-c.ebner@proxmox.com> (raw)
In-Reply-To: <20261106172235.890542-1-c.ebner@proxmox.com>
Allows to protect snapshots from being pruned by providing a retention
timestamp during backup.
Pruning must now also parse the manifest if present, which adds some
additional overhead on snapshot forget operations. This is however not
a performance critical code path as prunes run as dedicated worker
tasks or a single snapshot forget via API/CLI, for both cases the
additional parsing overhead on each snapshot prune is acceptable.
However, as a side effect manifests which cannot be parsed can no
longer be pruned without manual intervention.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/backup_info.rs | 9 ++++++
pbs-datastore/src/manifest.rs | 50 ++++++++++++++++++++++++++++++++
src/api2/backup/environment.rs | 14 +++++++++
src/api2/backup/mod.rs | 12 ++++++++
4 files changed, 85 insertions(+)
diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs
index f476d4469..ac3ea8378 100644
--- a/pbs-datastore/src/backup_info.rs
+++ b/pbs-datastore/src/backup_info.rs
@@ -924,6 +924,15 @@ impl BackupDir {
bail!("cannot remove protected snapshot"); // use special error type?
}
+ if let Some((manifest, _size)) = self.load_manifest_optionally(false)? {
+ if let Some(retain_until) = manifest.active_retention_lock()? {
+ bail!(
+ "snapshot protected by retention until {}",
+ proxmox_time::epoch_to_rfc3339(retain_until)?
+ );
+ }
+ }
+
if let DatastoreBackend::S3(s3_client) = backend {
let path = self.relative_path();
let snapshot_prefix = path
diff --git a/pbs-datastore/src/manifest.rs b/pbs-datastore/src/manifest.rs
index 4d482c252..548e419c6 100644
--- a/pbs-datastore/src/manifest.rs
+++ b/pbs-datastore/src/manifest.rs
@@ -82,6 +82,56 @@ impl BackupManifest {
Ok(())
}
+ /// Set or extend a retention time for given manifest. The given retention timestamp must be
+ /// greater than any already set timestamp on the manifest. Snapshot destruction is only allowed
+ /// after this time.
+ ///
+ /// The caller must assure a valid timestamp is passed, it does not exceed datastore wide
+ /// retention restrictions and required privileges to modify the timestamp are met.
+ pub fn modify_retention_timestamp(&mut self, timestamp: i64) -> Result<(), Error> {
+ if let Some(previous) = self.retention_timestamp()? {
+ if timestamp < previous {
+ bail!(
+ "cannot shorten retention time to {}, locked until {}",
+ proxmox_time::epoch_to_rfc3339_utc(timestamp)?,
+ proxmox_time::epoch_to_rfc3339_utc(previous)?,
+ );
+ }
+ }
+
+ self.unprotected["retain-until"] = timestamp.into();
+
+ Ok(())
+ }
+
+ /// Parse the retention timestamp for given manifest, if set.
+ ///
+ /// Returns `Ok(None)` if not set and errors when set but parsing failed.
+ pub fn retention_timestamp(&self) -> Result<Option<i64>, Error> {
+ match &self.unprotected["retain-until"] {
+ Value::Number(timestamp) => {
+ let retain_until = timestamp.as_i64().ok_or_else(|| {
+ format_err!("unexpected value for retain-until timestamp: {timestamp}")
+ })?;
+ Ok(Some(retain_until))
+ }
+ Value::Null => Ok(None),
+ _ => bail!("unexpected value variant for retain-until timestamp"),
+ }
+ }
+
+ /// Check if the manifest has a retention lock and if the lock is still active.
+ ///
+ /// Errors when parsing the retention timestamp fails.
+ pub fn active_retention_lock(&self) -> Result<Option<i64>, Error> {
+ if let Some(retain_until) = self.retention_timestamp()? {
+ if retain_until >= proxmox_time::epoch_i64() {
+ return Ok(Some(retain_until));
+ }
+ }
+ Ok(None)
+ }
+
pub fn files(&self) -> &[FileInfo] {
&self.files[..]
}
diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs
index be70d74f8..7b772c44f 100644
--- a/src/api2/backup/environment.rs
+++ b/src/api2/backup/environment.rs
@@ -154,6 +154,7 @@ pub struct BackupEnvironment {
pub backup_dir: BackupDir,
pub last_backup: Option<BackupInfo>,
pub backend: DatastoreBackend,
+ pub retain_until: Option<i64>,
state: Arc<Mutex<SharedBackupState>>,
}
@@ -166,6 +167,7 @@ impl BackupEnvironment {
backup_dir: BackupDir,
no_cache: bool,
backup_lock_guards: BackupLockGuards,
+ retain_until: Option<i64>,
) -> Result<Self, Error> {
let state = SharedBackupState {
finished: BackupState::Active,
@@ -195,6 +197,7 @@ impl BackupEnvironment {
last_backup: None,
backend,
state: Arc::new(Mutex::new(state)),
+ retain_until,
})
}
@@ -798,6 +801,17 @@ impl BackupEnvironment {
// check for valid manifest and store stats
manifest.unprotected["chunk_upload_stats"] = stats;
+ // Strip any retention timestamp from the client side uploaded manifest,
+ // only allow the retention calculated server side.
+ // This also covers dropping any pre-existing retentions from the source
+ // during push syncs, if not stripped by the client already.
+ if !manifest.unprotected["retain-until"].take().is_null() {
+ self.log("stripped 'retain-until' from client provided manifest");
+ }
+ if let Some(retain_until) = self.retain_until {
+ manifest.modify_retention_timestamp(retain_until)?;
+ }
+
for file_info in manifest.files() {
let archive_name = file_info.filename.as_ref();
match state.uploaded_archives.get(archive_name) {
diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs
index d658e8c17..7d2236c9e 100644
--- a/src/api2/backup/mod.rs
+++ b/src/api2/backup/mod.rs
@@ -53,6 +53,7 @@ pub const API_METHOD_UPGRADE_BACKUP: ApiMethod = ApiMethod::new(
("backup-type", false, &BACKUP_TYPE_SCHEMA),
("backup-id", false, &BACKUP_ID_SCHEMA),
("backup-time", false, &BACKUP_TIME_SCHEMA),
+ ("retain-until", true, &BACKUP_TIME_SCHEMA),
("debug", true, &BooleanSchema::new("Enable verbose debug logging.").schema()),
("benchmark", true, &BooleanSchema::new("Job is a benchmark (do not keep data).").schema()),
("no-cache", true, &BooleanSchema::new("Disable local datastore cache for network storages").schema()),
@@ -89,6 +90,16 @@ fn upgrade_to_backup_protocol(
let store = required_string_param(¶m, "store")?.to_owned();
let backup_ns = optional_ns_param(¶m)?;
let backup_dir_arg = pbs_api_types::BackupDir::deserialize(¶m)?;
+ let retain_until = match ¶m["retain-until"] {
+ Value::Number(timestamp) => {
+ let timestamp = timestamp
+ .as_i64()
+ .ok_or_else(|| format_err!("invalid retain-until timestamp"))?;
+ Some(timestamp)
+ }
+ Value::Null => None,
+ _ => bail!("unexpected retain-until timestamp variant"),
+ };
let user_info = CachedUserInfo::new()?;
@@ -234,6 +245,7 @@ fn upgrade_to_backup_protocol(
backup_dir,
no_cache,
backup_lock_guards,
+ retain_until,
)?;
env.debug = debug;
--
2.47.3
next prev parent reply other threads:[~2026-11-06 17:24 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-06 17:21 [PATCH proxmox{-widget-toolkit,,-backup} v2 00/43] append-only sync jobs and snapshot retention timespan Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 01/43] form: date time field: init with now instead of epoch on empty fields Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 02/43] form: date time field: set min/max value limits passed via config Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 03/43] form: date time field: update to new limits when switching day/time Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 04/43] form: date time field: submit combined datetime instead of item fields Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 05/43] form: date time field: track value like other form fields Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox v2 06/43] pbs-api-types: add append only privilege and role Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox v2 07/43] pbs-api-types: add remote datastore append " Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 08/43] pbs-api-types: extend snapshot list items by retention timestamp Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 09/43] pbs-api-types: extend sync job config by retention-timespan parameter Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 10/43] pbs-api-types: add max/default retention timespan property to datastore Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 11/43] pbs-api-types: store: expose max/default retention timespans in status Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 12/43] config/tools: add new fields for sync and snapshot/datastore list items Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 13/43] api: admin: improve code style for status endpoint Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 14/43] client: avoid error in status if user lacks permissions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 15/43] server: allow iterating contents for Datastore.Append permissions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 16/43] api: backup: fix possible information leak in multi-tenant datastores Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 17/43] datastore: s3: fix namespace level bulk remove not honoring group locks Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 18/43] api: backup: allow backup for user/token with append permission Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 19/43] api: allow namespace creation on append permissions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 20/43] api: sync: allow pull to target for user/token with append permission Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 21/43] sync: pull: allow pulling " Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 22/43] sync: push: allow push and ns creation on Remote.DatastoreAppend Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 23/43] datastore: conditionally treat missing manifest as error or benign Christian Ebner
2026-11-06 17:22 ` Christian Ebner [this message]
2026-11-06 17:22 ` [PATCH proxmox-backup v2 25/43] tools: include retain-until timestamp in snapshot list items Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 26/43] client: backup writer: allow to send retain-until timestamp on backup Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 27/43] sync: push: allow to set retention timestamp for synced snapshots Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 28/43] sync: pull: set retention timestamp from sync job for new snapshots Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 29/43] datastore/config: parse and enforce maximum retention timespan Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 30/43] api: config: allow to set or delete retention timespan for sync jobs Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 31/43] api: admin: allow to modify snapshot retention for root user Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 32/43] tape/s3-refresh: check for retentions outside datastore limits Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 33/43] ui: add retention timespan form and use it for sync job edit window Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 34/43] ui: allow datastore wide max retention timespan configuration Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 35/43] ui: show snapshot retention in datastore contents and allow extension Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 36/43] group: destroy: s3: skip snapshots with active retentions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 37/43] prune: " Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 38/43] api/ui: expose default retention setting as datastore config option Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 39/43] api: datastore: expose max/default retention timespans in status listing Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 40/43] backup/sync: fallback to datastore default-retention-timespan Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 41/43] client: add flags to set snapshot retention via timestamp/timespan Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 42/43] docs: describe the privileges and roles for append only backup/sync Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 43/43] docs: document snapshot retention for new backup snapshots Christian Ebner
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=20261106172235.890542-25-c.ebner@proxmox.com \
--to=c.ebner@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