From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v2 27/43] sync: push: allow to set retention timestamp for synced snapshots
Date: Fri, 6 Nov 2026 18:22:19 +0100 [thread overview]
Message-ID: <20261106172235.890542-28-c.ebner@proxmox.com> (raw)
In-Reply-To: <20261106172235.890542-1-c.ebner@proxmox.com>
Allow the push sync job to present the retention timestamp when
pushing the snapshot to the remote, if the remote supports it.
The timestamp is calculated based on the start time of the sync job
by push parameter construction.
Never propagate any retention timestamp present in the source
manifest, keeping them strictly separated.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
src/api2/push.rs | 11 +++++++++--
src/server/push.rs | 36 ++++++++++++++++++++++++++++++++----
src/server/sync.rs | 1 +
3 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/api2/push.rs b/src/api2/push.rs
index 8d053c00e..714971ac9 100644
--- a/src/api2/push.rs
+++ b/src/api2/push.rs
@@ -5,8 +5,9 @@ use pbs_api_types::{
Authid, BackupNamespace, CRYPT_KEY_ID_SCHEMA, DATASTORE_SCHEMA, GROUP_FILTER_LIST_SCHEMA,
GroupFilter, NS_MAX_DEPTH_REDUCED_SCHEMA, PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_READ,
PRIV_REMOTE_DATASTORE_APPEND, PRIV_REMOTE_DATASTORE_BACKUP, PRIV_REMOTE_DATASTORE_PRUNE,
- REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA, RateLimitConfig, SYNC_ENCRYPTED_ONLY_SCHEMA,
- SYNC_VERIFIED_ONLY_SCHEMA, SYNC_WORKER_THREADS_SCHEMA, TRANSFER_LAST_SCHEMA,
+ REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA, RateLimitConfig, RetentionTimespan,
+ SYNC_ENCRYPTED_ONLY_SCHEMA, SYNC_VERIFIED_ONLY_SCHEMA, SYNC_WORKER_THREADS_SCHEMA,
+ TRANSFER_LAST_SCHEMA,
};
use proxmox_rest_server::WorkerTask;
use proxmox_router::{Permission, Router, RpcEnvironment};
@@ -116,6 +117,10 @@ fn check_push_privs(
schema: CRYPT_KEY_ID_SCHEMA,
optional: true,
},
+ "retention-timespan": {
+ type: RetentionTimespan,
+ optional: true,
+ },
},
},
access: {
@@ -143,6 +148,7 @@ async fn push(
transfer_last: Option<usize>,
worker_threads: Option<usize>,
encryption_key: Option<String>,
+ retention_timespan: Option<RetentionTimespan>,
rpcenv: &mut dyn RpcEnvironment,
) -> Result<String, Error> {
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
@@ -176,6 +182,7 @@ async fn push(
transfer_last,
worker_threads,
encryption_key,
+ retention_timespan,
)
.await?;
diff --git a/src/server/push.rs b/src/server/push.rs
index 054ace8b4..0e14fe1c8 100644
--- a/src/server/push.rs
+++ b/src/server/push.rs
@@ -17,7 +17,7 @@ use pbs_api_types::{
GroupListItem, MANIFEST_BLOB_NAME, NamespaceListItem, Operation, PRIV_DATASTORE_BACKUP,
PRIV_DATASTORE_READ, PRIV_REMOTE_DATASTORE_APPEND, PRIV_REMOTE_DATASTORE_BACKUP,
PRIV_REMOTE_DATASTORE_MODIFY, PRIV_REMOTE_DATASTORE_PRUNE, RateLimitConfig, Remote,
- SnapshotListItem, print_store_and_ns,
+ RetentionTimespan, SnapshotListItem, print_store_and_ns,
};
use pbs_client::{
BackupRepository, BackupStats, BackupWriter, BackupWriterOptions, HttpClient, IndexType,
@@ -101,6 +101,8 @@ pub(crate) struct PushParameters {
/// Encryption key to use for pushing unencrypted backup snapshots. Does not affect
/// already encrypted snapshots.
crypt_config: Option<(String, Arc<CryptConfig>)>,
+ /// Retention timestamp to be set for newly pushed snapshots on sync target.
+ retain_until: Option<i64>,
}
impl PushParameters {
@@ -122,6 +124,7 @@ impl PushParameters {
transfer_last: Option<usize>,
worker_threads: Option<usize>,
active_encryption_key: Option<String>,
+ retention_timespan: Option<RetentionTimespan>,
) -> Result<Self, Error> {
if let Some(max_depth) = max_depth {
ns.check_max_depth(max_depth)?;
@@ -164,6 +167,17 @@ impl PushParameters {
bail!("Unsupported remote api version, minimum v2.2 required");
}
+ let retain_until = retention_timespan
+ .map(|timespan| {
+ if api_version < ApiVersion::new(4, 2, 11) {
+ bail!(
+ "Unsupported 'retain-until' by remote api version, minimum v4.2.11 required"
+ );
+ }
+ timespan.to_timestamp_from_systemtime()
+ })
+ .transpose()?;
+
let supports_prune_delete_stats = api_version >= ApiVersion::new(3, 2, 11);
let target = PushTarget {
@@ -196,6 +210,7 @@ impl PushParameters {
transfer_last,
worker_threads,
crypt_config,
+ retain_until,
})
}
@@ -926,12 +941,21 @@ pub(crate) async fn push_group(
if source_snapshots.contains(&snapshot.backup.time) {
continue;
}
- if snapshot.protected {
+ if snapshot.protected
+ || snapshot
+ .retain_until
+ .is_some_and(|retain_until| retain_until >= proxmox_time::epoch_i64())
+ {
+ let reason = if snapshot.protected {
+ "protected"
+ } else {
+ "retained"
+ };
log_sender
.log(
Level::INFO,
format!(
- "Kept protected snapshot {name} on remote",
+ "Kept {reason} snapshot {name} on remote",
name = snapshot.backup
),
)
@@ -1146,7 +1170,7 @@ pub(crate) async fn push_snapshot(
debug: false,
benchmark: false,
no_cache: false,
- retain_until: None,
+ retain_until: params.retain_until,
},
)
.await
@@ -1452,6 +1476,10 @@ pub(crate) async fn push_snapshot(
// Rewrite manifest for pushed snapshot, recreating manifest from source on target,
// needs to update all relevant info for new manifest.
target_manifest.unprotected = source_manifest.unprotected.clone();
+ // Never propagate the source retention timestamp to the target, it has been re-calculated and
+ // passed via the client when starting the backup session based on the sync job's retention
+ // timespan. Keeps source and target retentions independent.
+ target_manifest.unprotected["retain-until"].take();
if let Some((_id, crypt_config)) = &encrypt_using_key {
let sync_source_signature = source_manifest.signature(crypt_config)?;
target_manifest.set_sync_source_signature(&sync_source_signature)?;
diff --git a/src/server/sync.rs b/src/server/sync.rs
index 67d02a6a1..ab6792c2d 100644
--- a/src/server/sync.rs
+++ b/src/server/sync.rs
@@ -752,6 +752,7 @@ pub fn do_sync_job(
sync_job.transfer_last,
sync_job.worker_threads,
sync_job.active_encryption_key,
+ sync_job.retention_timespan,
)
.await?;
push_store(push_params).await?
--
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 ` [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 ` Christian Ebner [this message]
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-28-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.