upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix(updater): make clean-up job more robust / easier to debug

Browse source 
Signed-off-by: Josh <josh.t.richards@gmail.com>
This commit is contained in:
Josh 2024-10-12 19:03:55 -04:00 committed by Louis Chemineau
parent d05b5e3068
commit cd6ac0470e
No known key found for this signature in database
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php
View file

@ -28,17 +28,20 @@ class BackgroundCleanupUpdaterBackupsJob extends QueuedJob {
* @param array $argument
*/
public function run($argument): void {
$this->log->info("Running background job to clean-up outdated updater backups");
$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
$instanceId = $this->config->getSystemValue('instanceid', null);
if (!is_string($instanceId) || empty($instanceId)) {
$this->log->error("Skipping updater backup clean-up - instanceId is missing!");
return;
}
$updaterFolderPath = $updateDir . '/updater-' . $instanceId;
$backupFolderPath = $updaterFolderPath . '/backups';
if (file_exists($backupFolderPath)) {
$this->log->info("$backupFolderPath exists - start to clean it up");
$this->log->debug("Updater backup folder detected: $backupFolderPath");
$dirList = [];
$dirs = new \DirectoryIterator($backupFolderPath);
@ -52,6 +55,8 @@ class BackgroundCleanupUpdaterBackupsJob extends QueuedJob {
$realPath = $dir->getRealPath();
if ($realPath === false) {
$pathName = $dir->getPathname();
$this->log->warning("Skipping updater backup folder: $pathName (not found)");
continue;
}
@ -61,15 +66,18 @@ class BackgroundCleanupUpdaterBackupsJob extends QueuedJob {
ksort($dirList);
// drop the newest 3 directories
$dirList = array_slice($dirList, 0, -3);
$this->log->info('List of all directories that will be deleted: ' . json_encode($dirList));
$this->log->debug('Updater backup folders that will be deleted: ' . json_encode($dirList));
foreach ($dirList as $dir) {
$this->log->info("Removing $dir ...");
\OC_Helper::rmdirr($dir);
$result = \OC_Helper::rmdirr($dir);
if (!$result) {
$this->log->error('Could not remove updater backup folder $dir');
}
}
$this->log->info('Cleanup finished');
$this->log->info('Background job to clean-up updater backups has finished');
} else {
$this->log->info("Could not find updater directory $backupFolderPath - cleanup step not needed");
$this->log->warning("Skipping updater backup clean-up - could not find updater backup folder $backupFolderPath");
}
}
}