dillard
0f4a238414
Storage and repository:
- Listing skipped every name containing ".part-", directories too, so the
exports of a user like "john.part-time" were invisible to prune on S3,
SFTP, FTP and SMB and their data was deleted. Only real temporary uploads
("<name>.part-<8 hex>") are skipped now.
- prune refuses to run while a recorded per-user export's manifest is
missing, instead of freeing that export's data.
- forget() and untrash() copy first, switch the catalog, and delete the
originals last, so a crash can no longer leave the catalog pointing at a
missing snapshot or database dump.
- Writes are checked against the expected size, so a short upload is an
error instead of a truncated pack; raw restores check rename() and touch().
- A catalog write refuses to overwrite a generation another process just
wrote, and the catalog lock lasts 300 s, so opening a large repository
inside it no longer lets the lease run out.
Backup runs and scheduling:
- A file that keeps changing is read again at most three times; then the
last read is kept and reported, instead of restarting forever and
blocking cleanup.
- Unreadable files and folders are recorded, logged, shown by occ
backup:run, stored in the snapshot and notified to admins, instead of
being skipped silently.
- After a failed scheduled backup, at most three attempts a day, an hour
apart, instead of a new run and notification every five minutes.
- The job no longer spins on a run whose lease another process holds, and
the weekly cleanup catches up after a Sunday spent backing up.
- Notifications for the per-user export retention events.
68 lines
2.6 KiB
PHP
68 lines
2.6 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
// SPDX-FileCopyrightText: 2026 Dillard Blom
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
namespace OCA\NgBackup\Db;
|
|
|
|
use OCP\AppFramework\Db\QBMapper;
|
|
use OCP\DB\QueryBuilder\IQueryBuilder;
|
|
use OCP\IDBConnection;
|
|
|
|
/** @template-extends QBMapper<Run> */
|
|
final class RunMapper extends QBMapper {
|
|
public function __construct(IDBConnection $db) {
|
|
parent::__construct($db, 'ngb_runs', Run::class);
|
|
}
|
|
|
|
public function find(int $id): Run {
|
|
$qb = $this->db->getQueryBuilder();
|
|
$qb->select('*')->from($this->getTableName())->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
|
|
return $this->findEntity($qb);
|
|
}
|
|
|
|
/** @return list<Run> */
|
|
public function findRunning(?int $targetId = null, ?string $kind = null): array {
|
|
$qb = $this->db->getQueryBuilder();
|
|
$qb->select('*')->from($this->getTableName())->where($qb->expr()->eq('status', $qb->createNamedParameter(Run::RUNNING)));
|
|
if ($kind !== null) {
|
|
$qb->andWhere($qb->expr()->eq('kind', $qb->createNamedParameter($kind)));
|
|
}
|
|
if ($targetId !== null) {
|
|
$qb->andWhere($qb->expr()->eq('target_id', $qb->createNamedParameter($targetId, IQueryBuilder::PARAM_INT)));
|
|
}
|
|
return $this->findEntities($qb->orderBy('id'));
|
|
}
|
|
|
|
/** @return list<Run> */
|
|
public function findRecent(int $limit = 20): array {
|
|
$qb = $this->db->getQueryBuilder();
|
|
$qb->select('*')->from($this->getTableName())->orderBy('id', 'DESC')->setMaxResults($limit);
|
|
return $this->findEntities($qb);
|
|
}
|
|
|
|
/** @return list<Run> runs of $kind started at or after $since, newest first */
|
|
public function startedSince(int $targetId, string $kind, int $since): array {
|
|
$qb = $this->db->getQueryBuilder();
|
|
$qb->select('*')->from($this->getTableName())
|
|
->where($qb->expr()->eq('target_id', $qb->createNamedParameter($targetId, IQueryBuilder::PARAM_INT)))
|
|
->andWhere($qb->expr()->eq('kind', $qb->createNamedParameter($kind)))
|
|
->andWhere($qb->expr()->gte('started_at', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT)))
|
|
->orderBy('id', 'DESC');
|
|
return $this->findEntities($qb);
|
|
}
|
|
|
|
public function lastFinished(int $targetId, string $kind): ?Run {
|
|
$qb = $this->db->getQueryBuilder();
|
|
$qb->select('*')->from($this->getTableName())
|
|
->where($qb->expr()->eq('target_id', $qb->createNamedParameter($targetId, IQueryBuilder::PARAM_INT)))
|
|
->andWhere($qb->expr()->eq('kind', $qb->createNamedParameter($kind)))
|
|
->andWhere($qb->expr()->eq('status', $qb->createNamedParameter(Run::DONE)))
|
|
->orderBy('id', 'DESC')->setMaxResults(1);
|
|
$r = $this->findEntities($qb);
|
|
return $r[0] ?? null;
|
|
}
|
|
}
|