Skip to content

[stable29] fix(files_metadata): Don't run generation job on every upgrade #46564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Jul 25, 2024
Merged

[stable29] fix(files_metadata): Don't run generation job on every upgrade #46564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions core/BackgroundJobs/GenerateMetadataJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
use OCP\Files\IRootFolder;
use OCP\FilesMetadata\Exceptions\FilesMetadataNotFoundException;
use OCP\FilesMetadata\IFilesMetadataManager;
use OCP\IConfig;
use OCP\IAppConfig;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;

class GenerateMetadataJob extends TimedJob {
public function __construct(
ITimeFactory $time,
private IConfig $config,
private IAppConfig $appConfig,
private IRootFolder $rootFolder,
private IUserManager $userManager,
private IFilesMetadataManager $filesMetadataManager,
Expand All @@ -53,8 +53,13 @@ public function __construct(
}

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
Expand All @@ -70,7 +75,7 @@ protected function run(mixed $argument): void {
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.
Expand All @@ -79,8 +84,8 @@ protected function run(mixed $argument): void {
}
}

$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 {
Expand Down