upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-07-16 23:12:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sets base_timestamp for prune only once

Browse source
This commit is contained in:
Hugo Wallenburg 2026-06-16 21:42:24 +02:00
parent 1073da9eb1
commit 01aff2b7e2
No known key found for this signature in database
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/borg/archiver/prune_cmd.py
View file

@ -127,7 +127,7 @@ def prune(
archives: list[ArchiveInfo],
rule: PruningRule,
n_or_interval: int | timedelta,
since_timestamp: datetime | None,
base_timestamp: datetime | None,
keep_oldest: bool,
previously_kept: frozenset[ArchiveInfo] = frozenset(),
) -> dict[ArchiveInfo, KeepResult]:
@ -137,9 +137,9 @@ def prune(
if isinstance(n_or_interval, int):
n, earliest_timestamp = n_or_interval, None
else:
if since_timestamp is None:
raise ValueError("since_timestamp is required when using interval-based pruning")
n, earliest_timestamp = None, since_timestamp - n_or_interval
if base_timestamp is None:
raise ValueError("base_timestamp is required when using interval-based pruning")
n, earliest_timestamp = None, base_timestamp - n_or_interval
keep: dict[ArchiveInfo, KeepResult] = {}
@ -185,6 +185,8 @@ class PruneMixIn:
candidate_archives = archives
if since is not None:
base_timestamp = since
# `--since` is a prefilter: Archives from after this time are kept by default. They are not considered for
# pruning at all. They won't falsely occupy an active retention period.
for archive in archives:
@ -192,6 +194,8 @@ class PruneMixIn:
break
keep[archive] = KeepResult(rule=PRUNE_SINCE, idx=len(keep))
candidate_archives = archives[len(keep) :]
else:
base_timestamp = datetime.now().astimezone()
# Apply each retention rule to all candidate archives. The
# `previously_kept` parameter prevents later (coarser-grained) rules
@ -204,7 +208,7 @@ class PruneMixIn:
archives=candidate_archives,
rule=rule,
n_or_interval=n_or_interval,
since_timestamp=(since if since is not None else datetime.now().astimezone()),
base_timestamp=base_timestamp,
keep_oldest=(
rule == active_rules[-1][0]
), # Activate keep_oldest rule only for the largest active interval