danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: run forget on mirrors in the background (#136)

Browse source
This commit is contained in:
Nico 2025-12-14 10:34:25 +01:00 committed by GitHub
parent 7619612b1b
commit 8a5d45cbfb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/server/modules/backups/backups.service.ts
View file

@ -289,10 +289,12 @@ const executeBackup = async (scheduleId: number, manual = false) => {
} }
if (schedule.retentionPolicy) { if (schedule.retentionPolicy) {
void runForget(schedule.id); void runForget(schedule.id).catch((error) => {
logger.error(`Failed to run retention policy for schedule ${scheduleId}: ${toMessage(error)}`);
});
} }
copyToMirrors(scheduleId, repository, schedule.retentionPolicy).catch((error) => { void copyToMirrors(scheduleId, repository, schedule.retentionPolicy).catch((error) => {
logger.error(`Background mirror copy failed for schedule ${scheduleId}: ${toMessage(error)}`); logger.error(`Background mirror copy failed for schedule ${scheduleId}: ${toMessage(error)}`);
}); });
@ -421,7 +423,7 @@ const stopBackup = async (scheduleId: number) => {
abortController.abort(); abortController.abort();
}; };
const runForget = async (scheduleId: number) => { const runForget = async (scheduleId: number, repositoryId?: string) => {
const schedule = await db.query.backupSchedulesTable.findFirst({ const schedule = await db.query.backupSchedulesTable.findFirst({
where: eq(backupSchedulesTable.id, scheduleId), where: eq(backupSchedulesTable.id, scheduleId),
}); });
@ -435,7 +437,7 @@ const runForget = async (scheduleId: number) => {
} }
const repository = await db.query.repositoriesTable.findFirst({ const repository = await db.query.repositoriesTable.findFirst({
where: eq(repositoriesTable.id, schedule.repositoryId), where: eq(repositoriesTable.id, repositoryId ?? schedule.repositoryId),
}); });
if (!repository) { if (!repository) {
@ -443,7 +445,7 @@ const runForget = async (scheduleId: number) => {
} }
logger.info(`running retention policy (forget) for schedule ${scheduleId}`); logger.info(`running retention policy (forget) for schedule ${scheduleId}`);
const releaseLock = await repoMutex.acquireExclusive(repository.id, `forget:manual:${scheduleId}`); const releaseLock = await repoMutex.acquireExclusive(repository.id, `forget:${scheduleId}`);
try { try {
await restic.forget(repository.config, schedule.retentionPolicy, { tag: schedule.id.toString() }); await restic.forget(repository.config, schedule.retentionPolicy, { tag: schedule.id.toString() });
} finally { } finally {
@ -575,14 +577,11 @@ const copyToMirrors = async (
} }
if (retentionPolicy) { if (retentionPolicy) {
const releaseForget = await repoMutex.acquireExclusive(mirror.repository.id, `forget:mirror:${scheduleId}`); void runForget(scheduleId, mirror.repository.id).catch((error) => {
logger.error(
try { `Failed to run retention policy for mirror repository ${mirror.repository.name}: ${toMessage(error)}`,
logger.info(`[Background] Applying retention policy to mirror repository: ${mirror.repository.name}`); );
await restic.forget(mirror.repository.config, retentionPolicy, { tag: scheduleId.toString() }); });
} finally {
releaseForget();
}
} }
await db await db