From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v2 41/43] client: add flags to set snapshot retention via timestamp/timespan
Date: Fri, 6 Nov 2026 18:22:33 +0100 [thread overview]
Message-ID: <20261106172235.890542-42-c.ebner@proxmox.com> (raw)
In-Reply-To: <20261106172235.890542-1-c.ebner@proxmox.com>
Add `retention-timespan` and `retain-until` options to the clients
backup command.
Since the client does not a-priori know potential limits and
defaults configured on the target datastore, fetch this information
on-demand to check already client side for incompatibility.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
proxmox-backup-client/src/main.rs | 77 +++++++++++++++++++--
proxmox-backup-client/src/snapshot.rs | 98 ++++++++++++++++++++++++++-
2 files changed, 169 insertions(+), 6 deletions(-)
diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
index bfd26897d..ec83f0c81 100644
--- a/proxmox-backup-client/src/main.rs
+++ b/proxmox-backup-client/src/main.rs
@@ -28,9 +28,9 @@ use pxar::accessor::{MaybeReady, ReadAt, ReadAtOperation};
use pbs_api_types::{
ArchiveType, Authid, BACKUP_ID_SCHEMA, BACKUP_TIME_SCHEMA, BACKUP_TYPE_SCHEMA,
BackupArchiveName, BackupDir, BackupGroup, BackupNamespace, BackupPart, BackupType,
- CATALOG_NAME, ClientRateLimitConfig, CryptMode, ENCRYPTED_KEY_BLOB_NAME, Fingerprint,
- GroupListItem, MANIFEST_BLOB_NAME, PathPattern, PruneJobOptions, PruneListItem,
- RateLimitConfig, ServerIdentity, SnapshotListItem, StorageStatus,
+ CATALOG_NAME, ClientRateLimitConfig, CryptMode, DataStoreStatus, ENCRYPTED_KEY_BLOB_NAME,
+ Fingerprint, GroupListItem, MANIFEST_BLOB_NAME, PathPattern, PruneJobOptions, PruneListItem,
+ RateLimitConfig, RetentionTimespan, ServerIdentity, SnapshotListItem, StorageStatus,
};
use pbs_client::catalog_shell::Shell;
use pbs_client::pxar::{ErrorHandler as PxarErrorHandler, MetadataArchiveReader, PxarPrevRef};
@@ -794,6 +794,15 @@ fn spawn_catalog_upload(
optional: true,
default: false,
},
+ "retain-until": {
+ type: String,
+ description: "Retention timestamp in RFC3339 UTC format.",
+ optional: true,
+ },
+ "retention-timespan": {
+ type: RetentionTimespan,
+ optional: true,
+ },
}
}
)]
@@ -987,11 +996,65 @@ async fn create_backup(
let backup_time = backup_time_opt.unwrap_or_else(epoch_i64);
+ let retain_until_param = match param["retain-until"].as_str() {
+ Some(s) => Some(proxmox_time::parse_rfc3339(s)?),
+ None => None,
+ };
+ let retention_timespan_param: Option<RetentionTimespan> =
+ match param["retention-timespan"].as_str() {
+ Some(s) => Some(s.parse()?),
+ None => None,
+ };
+
+ let retain_until = match (retain_until_param, retention_timespan_param) {
+ (Some(_), Some(_)) => {
+ bail!("cannot specify both '--retain-until' and '--retention-timespan'")
+ }
+ (Some(timestamp), None) => Some(timestamp),
+ (None, Some(timespan)) => Some(timespan.to_timestamp_from_systemtime()?),
+ (None, None) => None,
+ };
+
let detection_mode = change_detection_mode.unwrap_or_default();
let http_client = connect_rate_limited(&repo, rate_limit)?;
record_repository(&repo);
+ // Check server retention limits and validate requested retention
+ let datastore_status = match http_client
+ .get(
+ &format!("api2/json/admin/datastore/{}/status", repo.store()),
+ None,
+ )
+ .await
+ {
+ Ok(mut res) => serde_json::from_value::<DataStoreStatus>(res["data"].take()).ok(),
+ Err(_) => None,
+ };
+
+ if let Some(status) = &datastore_status {
+ if let Some(target_retention) = retain_until {
+ if let Some(max_retention) = &status.max_retention_timespan {
+ let max_timestamp = max_retention.to_timestamp_from_systemtime()?;
+ if target_retention > max_timestamp {
+ bail!(
+ "requested retention timestamp '{}' exceeds datastore limit of '{}' (max retention: {})",
+ proxmox_time::epoch_to_rfc3339_utc(target_retention)?,
+ proxmox_time::epoch_to_rfc3339_utc(max_timestamp)?,
+ max_retention,
+ );
+ }
+ } else {
+ bail!(
+ "datastore '{}' has no maximum retention timespan configured; retention cannot be set",
+ repo.store()
+ );
+ }
+ } else if let Some(default_retention) = &status.default_retention_timespan {
+ log::info!("Server datastore default retention: {default_retention}");
+ }
+ }
+
let snapshot = BackupDir::from((backup_type, backup_id.to_owned(), backup_time));
if backup_ns.is_root() {
log::info!("Starting backup: {snapshot}");
@@ -1007,6 +1070,12 @@ async fn create_backup(
"Starting backup protocol: {}",
strftime_local("%c", epoch_i64())?
);
+ if let Some(retain_until) = retain_until {
+ log::info!(
+ "Requesting retention until: {}",
+ proxmox_time::epoch_to_rfc3339_utc(retain_until)?,
+ );
+ }
let (crypt_config, rsa_encrypted_key) = match crypto.enc_key {
None => (None, None),
@@ -1054,7 +1123,7 @@ async fn create_backup(
debug: true,
benchmark: false,
no_cache,
- retain_until: None,
+ retain_until,
},
)
.await?;
diff --git a/proxmox-backup-client/src/snapshot.rs b/proxmox-backup-client/src/snapshot.rs
index 438d03b5a..4a751c5da 100644
--- a/proxmox-backup-client/src/snapshot.rs
+++ b/proxmox-backup-client/src/snapshot.rs
@@ -1,13 +1,15 @@
use std::sync::Arc;
-use anyhow::Error;
+use anyhow::{Error, bail};
use serde_json::{Value, json};
use proxmox_router::cli::*;
use proxmox_schema::api;
use proxmox_sys::fs::file_get_contents;
-use pbs_api_types::{BackupGroup, BackupNamespace, CryptMode, SnapshotListItem};
+use pbs_api_types::{
+ BackupGroup, BackupNamespace, CryptMode, DataStoreStatus, RetentionTimespan, SnapshotListItem,
+};
use pbs_client::tools::key_source::get_encryption_key_password;
use pbs_datastore::DataBlob;
use pbs_key_config::decrypt_key;
@@ -479,10 +481,102 @@ fn notes_cli() -> CliCommandMap {
)
}
+#[api(
+ input: {
+ properties: {
+ repo: {
+ type: BackupTargetArgs,
+ flatten: true,
+ },
+ snapshot: {
+ type: String,
+ description: "Snapshot path.",
+ },
+ "retain-until": {
+ type: String,
+ description: "Retention timestamp in RFC3339 UTC format.",
+ optional: true,
+ },
+ "retention-timespan": {
+ type: RetentionTimespan,
+ optional: true,
+ },
+ }
+ }
+)]
+/// Set or extend the retention timestamp of a snapshot
+async fn update_retention(param: Value) -> Result<(), Error> {
+ let repo = extract_repository_from_value(¶m)?;
+ let path = required_string_param(¶m, "snapshot")?;
+
+ let retain_until_param = match param["retain-until"].as_str() {
+ Some(s) => Some(proxmox_time::parse_rfc3339(s)?),
+ None => None,
+ };
+
+ let retention_timespan_param: Option<RetentionTimespan> =
+ match param["retention-timespan"].as_str() {
+ Some(s) => Some(s.parse()?),
+ None => None,
+ };
+
+ let retain_until = match (retain_until_param, retention_timespan_param) {
+ (Some(_), Some(_)) => {
+ bail!("cannot specify both '--retain-until' and '--retention-timespan'")
+ }
+ (Some(timestamp), None) => timestamp,
+ (None, Some(timespan)) => timespan.to_timestamp_from_systemtime()?,
+ (None, None) => bail!("must specify either '--retain-until' or '--retention-timespan'"),
+ };
+
+ let backup_ns = optional_ns_param(¶m)?;
+ let snapshot: BackupDir = path.parse()?;
+ let client = connect(&repo)?;
+ let api_path = format!("api2/json/admin/datastore/{}/status", repo.store());
+
+ if let Ok(mut status_res) = client.get(&api_path, None).await {
+ if let Ok(status) = serde_json::from_value::<DataStoreStatus>(status_res["data"].take()) {
+ if let Some(max_retention) = &status.max_retention_timespan {
+ let max_timestamp = max_retention.to_timestamp_from_systemtime()?;
+ if retain_until > max_timestamp {
+ bail!(
+ "requested retention timestamp '{}' exceeds datastore limit of '{}' (max retention: {})",
+ proxmox_time::epoch_to_rfc3339_utc(retain_until)?,
+ proxmox_time::epoch_to_rfc3339_utc(max_timestamp)?,
+ max_retention,
+ );
+ }
+ }
+ }
+ }
+
+ let path = format!("api2/json/admin/datastore/{}/retention", repo.store());
+ let mut args = snapshot_args(&backup_ns, &snapshot)?;
+ args["retain-until"] = Value::from(retain_until);
+
+ client.put(&path, Some(args)).await?;
+
+ let date_str = proxmox_time::epoch_to_rfc3339_utc(retain_until)?;
+ log::info!("successfully set retention until {date_str}");
+
+ Ok(())
+}
+
+fn retention_cli() -> CliCommandMap {
+ CliCommandMap::new().insert(
+ "update",
+ CliCommand::new(&API_METHOD_UPDATE_RETENTION)
+ .arg_param(&["snapshot"])
+ .completion_cb("ns", complete_namespace)
+ .completion_cb("snapshot", complete_backup_snapshot),
+ )
+}
+
pub fn snapshot_mgtm_cli() -> CliCommandMap {
CliCommandMap::new()
.insert("notes", notes_cli())
.insert("protected", protected_cli())
+ .insert("retention", retention_cli())
.insert(
"list",
CliCommand::new(&API_METHOD_LIST_SNAPSHOTS)
--
2.47.3
next prev parent reply other threads:[~2026-11-06 17:25 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 ` [PATCH proxmox-backup v2 24/43] api: backup: provide retain-until timestamp for extended prune protection Christian Ebner
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 ` Christian Ebner [this message]
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-42-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