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.
93 lines
3.5 KiB
PHP
93 lines
3.5 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
// SPDX-FileCopyrightText: 2026 Dillard Blom
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
namespace OCA\NgBackup\Command;
|
|
|
|
use OCA\NgBackup\Db\Run;
|
|
use OCA\NgBackup\Service\BackupService;
|
|
use OCA\NgBackup\Service\TargetService;
|
|
use Symfony\Component\Console\Command\Command;
|
|
use Symfony\Component\Console\Input\InputArgument;
|
|
use Symfony\Component\Console\Input\InputInterface;
|
|
use Symfony\Component\Console\Input\InputOption;
|
|
use Symfony\Component\Console\Output\OutputInterface;
|
|
|
|
final class RunBackup extends Command {
|
|
public function __construct(
|
|
private BackupService $backups,
|
|
private TargetService $targets,
|
|
) {
|
|
parent::__construct();
|
|
}
|
|
|
|
protected function configure(): void {
|
|
$this->setName('backup:run')
|
|
->setDescription('Back up this Nextcloud (database, config, data) to a location now')
|
|
->addArgument('target', InputArgument::OPTIONAL, 'Location name or id (default: all locations)')
|
|
->addOption('label', 'l', InputOption::VALUE_REQUIRED, 'Label for the snapshot', '')
|
|
->addOption('background', 'b', InputOption::VALUE_NONE, 'Only start the run; background jobs finish it')
|
|
->setHelp(<<<'HELP'
|
|
Starts a backup (or continues one that is already running for that location) and runs it to
|
|
the end in this process. Unchanged files are not read again; only new data is uploaded.
|
|
|
|
Examples:
|
|
occ backup:run back up to every location
|
|
occ backup:run offsite -l "before upgrade"
|
|
occ backup:run offsite --background
|
|
HELP);
|
|
}
|
|
|
|
protected function execute(InputInterface $input, OutputInterface $output): int {
|
|
$name = $input->getArgument('target');
|
|
try {
|
|
$targets = $name === null ? $this->targets->list() : [$this->targets->get($name)];
|
|
} catch (\Throwable) {
|
|
$output->writeln('<error>No such location.</error>');
|
|
return 1;
|
|
}
|
|
if ($targets === []) {
|
|
$output->writeln('<error>No backup locations yet (occ backup:target:add).</error>');
|
|
return 1;
|
|
}
|
|
$failed = 0;
|
|
foreach ($targets as $t) {
|
|
try {
|
|
$run = $this->backups->start($t, (string)$input->getOption('label'));
|
|
} catch (\Throwable $e) {
|
|
$output->writeln('<error>' . $t->getName() . ': ' . $e->getMessage() . '</error>');
|
|
$failed++;
|
|
continue;
|
|
}
|
|
$output->writeln(sprintf('<info>%s</info>: run %d, snapshot %s', $t->getName(), $run->getId(), $run->getSnapshotId()));
|
|
if ($input->getOption('background')) {
|
|
continue;
|
|
}
|
|
$start = microtime(true);
|
|
$run = $this->backups->runToCompletion($run, function (Run $r) use ($output, $start) {
|
|
$s = json_decode($r->getStats() ?? '{}', true);
|
|
$f = $s['files'] ?? [];
|
|
$output->writeln(sprintf(' %5.0fs %-6s files %d (read %d, unchanged %d), uploaded %.1f MiB',
|
|
microtime(true) - $start, $r->getPhase(), $f['files'] ?? 0, $f['read'] ?? 0, $f['reused'] ?? 0, ($f['uploaded'] ?? 0) / 1048576));
|
|
});
|
|
if ($run->getStatus() === Run::DONE) {
|
|
$output->writeln(sprintf(' done in %.0fs', microtime(true) - $start));
|
|
$f = json_decode($run->getStats() ?? '{}', true)['files'] ?? [];
|
|
if (($f['unreadable'] ?? 0) > 0) {
|
|
$output->writeln(sprintf('<comment> warning: %d unreadable files or folders are missing from this backup (see the server log)</comment>', $f['unreadable']));
|
|
}
|
|
if (($f['changing'] ?? 0) > 0) {
|
|
$output->writeln(sprintf('<comment> warning: %d files kept changing and were saved as read (see the server log)</comment>', $f['changing']));
|
|
}
|
|
} else {
|
|
$output->writeln('<error> ' . $run->getStatus() . ': ' . $run->getError() . '</error>');
|
|
$failed++;
|
|
}
|
|
}
|
|
return $failed === 0 ? 0 : 1;
|
|
}
|
|
}
|