M2: full backup runs (database, config, data) with occ and cron

BackupService starts a run per location (database dump in one transaction, then config + data directory as a resumable file run), stores the state in ngb_runs after every step, locks a run while a step executes and records the snapshot. Previews, logs, updater backups and per-user cache/uploads are excluded (TreeWalker now supports patterns). BackupJob (every 5 min) starts the daily schedule and steps running runs with a short budget under web cron and a long one under system cron. occ: backup:run, backup:status, backup:list. Tested on NC34/PostgreSQL: first run 128 files / 1 GiB in 64 s (443 MiB uploaded to S3), unchanged second run 2 s / 0 bytes; a background run to SFTP completed through cron.php.
2026-10-02 00:53:50 +02:00
parent 9cefea019d
commit 2ab4b2e7d5
12 changed files with 693 additions and 15 deletions
@@ -0,0 +1,60 @@
+<?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\Entity;
+
+/**
+ * @method int getTargetId()
+ * @method void setTargetId(int $v)
+ * @method string getKind()
+ * @method void setKind(string $v)
+ * @method string getStatus()
+ * @method void setStatus(string $v)
+ * @method string getPhase()
+ * @method void setPhase(string $v)
+ * @method string getState()
+ * @method void setState(string $v)
+ * @method string|null getStats()
+ * @method void setStats(?string $v)
+ * @method string|null getError()
+ * @method void setError(?string $v)
+ * @method string|null getSnapshotId()
+ * @method void setSnapshotId(?string $v)
+ * @method int getStartedAt()
+ * @method void setStartedAt(int $v)
+ * @method int getUpdatedAt()
+ * @method void setUpdatedAt(int $v)
+ * @method int|null getFinishedAt()
+ * @method void setFinishedAt(?int $v)
+ */
+class Run extends Entity {
+	public const RUNNING = 'running';
+	public const DONE = 'done';
+	public const FAILED = 'failed';
+	public const CANCELLED = 'cancelled';
+
+	protected int $targetId = 0;
+	protected string $kind = '';
+	protected string $status = '';
+	protected string $phase = '';
+	protected string $state = '{}';
+	protected ?string $stats = null;
+	protected ?string $error = null;
+	protected ?string $snapshotId = null;
+	protected int $startedAt = 0;
+	protected int $updatedAt = 0;
+	protected ?int $finishedAt = null;
+
+	public function __construct() {
+		$this->addType('targetId', 'integer');
+		$this->addType('startedAt', 'integer');
+		$this->addType('updatedAt', 'integer');
+		$this->addType('finishedAt', 'integer');
+	}
+}
@@ -0,0 +1,53 @@
+<?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> */
+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): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')->from($this->getTableName())->where($qb->expr()->eq('status', $qb->createNamedParameter(Run::RUNNING)));
+		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);
+	}
+
+	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;
+	}
+}
@@ -0,0 +1,43 @@
+<?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\Entity;
+
+/**
+ * @method int getTargetId()
+ * @method void setTargetId(int $v)
+ * @method string getSnapshotId()
+ * @method void setSnapshotId(string $v)
+ * @method string getKind()
+ * @method void setKind(string $v)
+ * @method string|null getLabel()
+ * @method void setLabel(?string $v)
+ * @method int getCreatedAt()
+ * @method void setCreatedAt(int $v)
+ * @method int|null getFiles()
+ * @method void setFiles(?int $v)
+ * @method int|null getBytes()
+ * @method void setBytes(?int $v)
+ */
+class Snapshot extends Entity {
+	protected int $targetId = 0;
+	protected string $snapshotId = '';
+	protected string $kind = '';
+	protected ?string $label = null;
+	protected int $createdAt = 0;
+	protected ?int $files = null;
+	protected ?int $bytes = null;
+
+	public function __construct() {
+		$this->addType('targetId', 'integer');
+		$this->addType('createdAt', 'integer');
+		$this->addType('files', 'integer');
+		$this->addType('bytes', 'integer');
+	}
+}
@@ -0,0 +1,45 @@
+<?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<Snapshot> */
+class SnapshotMapper extends QBMapper {
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'ngb_snapshots', Snapshot::class);
+	}
+
+	/** @return list<Snapshot> newest first */
+	public function findForTarget(int $targetId): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')->from($this->getTableName())
+			->where($qb->expr()->eq('target_id', $qb->createNamedParameter($targetId, IQueryBuilder::PARAM_INT)))
+			->orderBy('created_at', 'DESC');
+		return $this->findEntities($qb);
+	}
+
+	public function findOne(int $targetId, string $snapshotId): Snapshot {
+		$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('snapshot_id', $qb->createNamedParameter($snapshotId)));
+		return $this->findEntity($qb);
+	}
+
+	public function latest(int $targetId, string $kind): ?Snapshot {
+		foreach ($this->findForTarget($targetId) as $s) {
+			if ($s->getKind() === $kind) {
+				return $s;
+			}
+		}
+		return null;
+	}
+}