diff options
Diffstat (limited to 'core/BackgroundJobs')
5 files changed, 50 insertions, 17 deletions
diff --git a/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php b/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php index c6cf833342f..d1ecc08ca4b 100644 --- a/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php +++ b/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php @@ -10,6 +10,7 @@ namespace OC\Core\BackgroundJobs; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\QueuedJob; +use OCP\Files; use OCP\IConfig; use Psr\Log\LoggerInterface; @@ -28,17 +29,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 +56,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 +67,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 = Files::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"); } } } diff --git a/core/BackgroundJobs/CheckForUserCertificates.php b/core/BackgroundJobs/CheckForUserCertificates.php index 7fa5951d775..c4ac28905ef 100644 --- a/core/BackgroundJobs/CheckForUserCertificates.php +++ b/core/BackgroundJobs/CheckForUserCertificates.php @@ -32,7 +32,7 @@ class CheckForUserCertificates extends QueuedJob { */ public function run($arguments): void { $uploadList = []; - $this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList) { + $this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList): void { $userId = $user->getUID(); try { \OC_Util::setupFS($userId); diff --git a/core/BackgroundJobs/CleanupLoginFlowV2.php b/core/BackgroundJobs/CleanupLoginFlowV2.php index 0a95bf91579..e5bcf00a921 100644 --- a/core/BackgroundJobs/CleanupLoginFlowV2.php +++ b/core/BackgroundJobs/CleanupLoginFlowV2.php @@ -19,7 +19,7 @@ class CleanupLoginFlowV2 extends TimedJob { ) { parent::__construct($time); - $this->setInterval(3600); + $this->setInterval(60 * 60); } protected function run($argument): void { diff --git a/core/BackgroundJobs/GenerateMetadataJob.php b/core/BackgroundJobs/GenerateMetadataJob.php index 607d4dd7b20..cb02a8e4ffa 100644 --- a/core/BackgroundJobs/GenerateMetadataJob.php +++ b/core/BackgroundJobs/GenerateMetadataJob.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace OC\Core\BackgroundJobs; +use OC\Files\Mount\MoveableMount; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\TimedJob; @@ -15,14 +16,19 @@ use OCP\Files\Folder; use OCP\Files\IRootFolder; use OCP\FilesMetadata\Exceptions\FilesMetadataNotFoundException; use OCP\FilesMetadata\IFilesMetadataManager; +use OCP\IAppConfig; use OCP\IConfig; use OCP\IUserManager; use Psr\Log\LoggerInterface; class GenerateMetadataJob extends TimedJob { + // Default file size limit for metadata generation (MBytes). + protected const DEFAULT_MAX_FILESIZE = 256; + public function __construct( ITimeFactory $time, private IConfig $config, + private IAppConfig $appConfig, private IRootFolder $rootFolder, private IUserManager $userManager, private IFilesMetadataManager $filesMetadataManager, @@ -31,13 +37,18 @@ class GenerateMetadataJob extends TimedJob { ) { parent::__construct($time); - $this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE); - $this->setInterval(24 * 3600); + $this->setTimeSensitivity(self::TIME_INSENSITIVE); + $this->setInterval(24 * 60 * 60); } protected function run(mixed $argument): void { + if ($this->appConfig->getValueBool('core', 'metadataGenerationDone', false)) { + return; + } + + $lastHandledUser = $this->appConfig->getValueString('core', 'metadataGenerationLastHandledUser', ''); + $users = $this->userManager->search(''); - $lastHandledUser = $this->config->getAppValue('core', 'metadataGenerationLastHandledUser', ''); // we'll only start timer once we have found a valid user to handle // meaning NOW if we have not handled any user from a previous run @@ -53,7 +64,7 @@ class GenerateMetadataJob extends TimedJob { continue; } - $this->config->setAppValue('core', 'metadataGenerationLastHandledUser', $userId); + $this->appConfig->setValueString('core', 'metadataGenerationLastHandledUser', $userId); $this->scanFilesForUser($user->getUID()); // Stop if execution time is more than one hour. @@ -62,8 +73,8 @@ class GenerateMetadataJob extends TimedJob { } } - $this->jobList->remove(GenerateMetadataJob::class); - $this->config->deleteAppValue('core', 'metadataGenerationLastHandledUser'); + $this->appConfig->deleteKey('core', 'metadataGenerationLastHandledUser'); + $this->appConfig->setValueBool('core', 'metadataGenerationDone', true); } private function scanFilesForUser(string $userId): void { @@ -73,7 +84,7 @@ class GenerateMetadataJob extends TimedJob { private function scanFolder(Folder $folder): void { // Do not scan share and other moveable mounts. - if ($folder->getMountPoint() instanceof \OC\Files\Mount\MoveableMount) { + if ($folder->getMountPoint() instanceof MoveableMount) { return; } @@ -83,6 +94,15 @@ class GenerateMetadataJob extends TimedJob { continue; } + // Don't generate metadata for files bigger than configured metadata_max_filesize + // Files are loaded in memory so very big files can lead to an OOM on the server + $nodeSize = $node->getSize(); + $nodeLimit = $this->config->getSystemValueInt('metadata_max_filesize', self::DEFAULT_MAX_FILESIZE); + if ($nodeSize > $nodeLimit * 1000000) { + $this->logger->debug('Skipping generating metadata for fileid ' . $node->getId() . " as its size exceeds configured 'metadata_max_filesize'."); + continue; + } + try { $this->filesMetadataManager->getMetadata($node->getId(), false); } catch (FilesMetadataNotFoundException) { @@ -92,7 +112,7 @@ class GenerateMetadataJob extends TimedJob { IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND ); } catch (\Throwable $ex) { - $this->logger->warning("Error while generating metadata for fileid " . $node->getId(), ['exception' => $ex]); + $this->logger->warning('Error while generating metadata for fileid ' . $node->getId(), ['exception' => $ex]); } } } diff --git a/core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php b/core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php index 01eec5b3ce1..86622e58758 100644 --- a/core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php +++ b/core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php @@ -27,8 +27,12 @@ class LookupServerSendCheckBackgroundJob extends QueuedJob { * @param array $argument */ public function run($argument): void { - $this->userManager->callForSeenUsers(function (IUser $user) { - $this->config->setUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '1'); + $this->userManager->callForSeenUsers(function (IUser $user): void { + // If the user data was not updated yet (check if LUS is enabled and if then update on LUS or delete on LUS) + // then we need to flag the user data to be checked + if ($this->config->getUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '') === '') { + $this->config->setUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '1'); + } }); } } |