Ensembia/nextcloud-ng_backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Phase 2: retention for per-user exports (occ backup:retention --user-last)
CI / unit (8.2) (push) Has been cancelled
Details
CI / unit (8.3) (push) Has been cancelled
Details
CI / unit (8.4) (push) Has been cancelled
Details
CI / psalm (push) Has been cancelled
Details
CI / integration (mariadb, 32) (push) Has been cancelled
Details
CI / integration (mariadb, 33) (push) Has been cancelled
Details
CI / integration (mariadb, 34) (push) Has been cancelled
Details
CI / integration (mariadb, 35) (push) Has been cancelled
Details
CI / integration (pgsql, 32) (push) Has been cancelled
Details
CI / integration (pgsql, 33) (push) Has been cancelled
Details
CI / integration (pgsql, 34) (push) Has been cancelled
Details
CI / integration (pgsql, 35) (push) Has been cancelled
Details
CI / integration (sqlite, 32) (push) Has been cancelled
Details
CI / integration (sqlite, 33) (push) Has been cancelled
Details
CI / integration (sqlite, 34) (push) Has been cancelled
Details
CI / integration (sqlite, 35) (push) Has been cancelled
Details
CI / integration-targets (push) Has been cancelled
Details
CI / integration-user (push) Has been cancelled
Details
CI / integration-full-restore (push) Has been cancelled
Details

Browse Source 
PruneService::userExportRetention()/setUserExportRetention(): a single, app-wide "keep the
newest N" setting (default 3, same default as the snapshot policy's "last"), deliberately simpler
than the full daily/weekly/monthly RetentionPolicy -- per-user exports are on-demand only (occ
backup:backup:user, see the fold-out task about whether they ever join the automatic schedule),
so there is no regular cadence yet to bucket by day/week/month.

PruneService::applyUserExports(): groups a location's user exports by uid (read from each
manifest's own 'time' field, the same field snapshot retention already reads), keeps the newest N
per user, forgets the rest. No trash, unlike a snapshot: these are not yet the primary safety net
the deletion delay protects. Runs under the same exclusive lock as snapshot retention.

occ backup:retention gained --user-last=N; occ backup:prune now also applies it for every target
it processes, reporting counts the same way it already does for snapshots and blob packs.

Verified live against the dev rig (four real exports across four users, confirmed exactly the
expected ones were kept/forgotten at two different --user-last values) and added coverage to
tests/integration/user-roundtrip.sh (an account's manual export plus the automatic safety-export
a replace-mode restore makes of it, pruned down to --user-last=2).
This commit is contained in:
Dillard Blom
2026-10-06 00:44:23 +02:00
parent 932f60bc5e
commit c9f82a79e4
5 changed files with 105 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PLAN.md
+4 -1
View File
@@ -346,7 +346,10 @@ minimale volledige restore (`occ backup:restore:full` op een verse installatie)
SMB vereist de `smbclient` PECL-extensie (niet standaard in de Nextcloud-image, in CI nu
on-the-fly gebouwd). NFS is geen eigen backend: lokaal mounten + `local`-backend erop richten.
3. Verificatie/checksum-audit-commando — **klaar** (2026-10-05)
4. Retentie/prune voor user-exports
4. Retentie/prune voor user-exports — **klaar** (2026-10-06): `occ backup:retention --user-last=N`
(standaard 3, per installatie, net als de bestaande snapshot-policy), toegepast door
`occ backup:prune` (geen prullenbak voor user-exports, in tegenstelling tot snapshots — on-demand,
niet het primaire vangnet).
5. Automatische user-export inpluggen in het reguliere schema (of expliciet besluit dat het on-demand blijft)
9. SMB/NFS intern testen op de eigen OMV-instantie — nog open (intern, niet in CI)