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

Backup step: reporting on a committed snapshot cannot fail the run; check the snapshot row after a unique violation

Browse Source
This commit is contained in:
Dillard Blom
2026-10-11 12:30:05 +02:00
parent 6385925845
commit 8e273ac259
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Service/BackupService.php
+20 -9
View File
@@ -168,14 +168,20 @@ final class BackupService {
} }
if ($state['files']['phase'] === 'done') { if ($state['files']['phase'] === 'done') {
$this->recordSnapshot($run, $state['files']); $this->recordSnapshot($run, $state['files']);
$this->alerts->storedBytes($target, $repo->storedBytes()); // The snapshot is committed: what follows only reports on it and must not turn
$stats = $state['files']['stats']; // the run into a failure.
if (($stats['unreadable'] ?? 0) > 0 || ($stats['changing'] ?? 0) > 0) { try {
$warnings = BackupRun::warnings($state['files']); $this->alerts->storedBytes($target, $repo->storedBytes());
$this->logger->warning(sprintf('NG Backup run %d to %s: %d unreadable (missing from the snapshot): %s; %d changed while being read: %s', $stats = $state['files']['stats'];
$run->getId(), $target->getName(), $stats['unreadable'] ?? 0, implode(', ', $warnings['unreadable']), if (($stats['unreadable'] ?? 0) > 0 || ($stats['changing'] ?? 0) > 0) {
$stats['changing'] ?? 0, implode(', ', $warnings['changing']))); $warnings = BackupRun::warnings($state['files']);
$this->alerts->runWarnings($run, $target->getName(), (int)($stats['unreadable'] ?? 0), (int)($stats['changing'] ?? 0), $warnings); $this->logger->warning(sprintf('NG Backup run %d to %s: %d unreadable (missing from the snapshot): %s; %d changed while being read: %s',
$run->getId(), $target->getName(), $stats['unreadable'] ?? 0, implode(', ', $warnings['unreadable']),
$stats['changing'] ?? 0, implode(', ', $warnings['changing'])));
$this->alerts->runWarnings($run, $target->getName(), (int)($stats['unreadable'] ?? 0), (int)($stats['changing'] ?? 0), $warnings);
}
} catch (\Throwable $e) {
$this->logger->warning('NG Backup run ' . $run->getId() . ': reporting on the finished backup failed: ' . $e->getMessage(), ['exception' => $e]);
} }
$run->setStatus(Run::DONE); $run->setStatus(Run::DONE);
$run->setPhase('done'); $run->setPhase('done');
@@ -258,10 +264,15 @@ final class BackupService {
try { try {
$this->snapshots->insert($s); $this->snapshots->insert($s);
} catch (\OCP\DB\Exception $e) { } catch (\OCP\DB\Exception $e) {
// Recorded by another process between the check above and this insert. // Recorded by another process between the check above and this insert?
if ($e->getReason() !== \OCP\DB\Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) { if ($e->getReason() !== \OCP\DB\Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e; throw $e;
} }
try {
$this->snapshots->findOne($run->getTargetId(), $files['snapshot']);
} catch (DoesNotExistException) {
throw $e;
}
} }
} }