sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(taskprocessing): fix condition to reschedule SynchronousBackgroundJob 

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
pull/47522/head
Julien Veyssier 2024-08-27 13:22:12 +07:00
parent c1ed256d50
commit 396b8f52f1
No known key found for this signature in database
GPG Key ID: 4141FEE162030638
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/private/TaskProcessing/SynchronousBackgroundJob.php
Unescape Escape View File

@ -9,14 +9,8 @@ namespace OC\TaskProcessing;
use OCP\AppFramework\Utility\ITimeFactory; use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\QueuedJob; use OCP\BackgroundJob\QueuedJob;
use OCP\Files\GenericFileException;
use OCP\Files\NotPermittedException;
use OCP\Lock\LockedException;
use OCP\TaskProcessing\Exception\Exception; use OCP\TaskProcessing\Exception\Exception;
use OCP\TaskProcessing\Exception\NotFoundException; use OCP\TaskProcessing\Exception\NotFoundException;
use OCP\TaskProcessing\Exception\ProcessingException;
use OCP\TaskProcessing\Exception\UnauthorizedException;
use OCP\TaskProcessing\Exception\ValidationException;
use OCP\TaskProcessing\IManager; use OCP\TaskProcessing\IManager;
use OCP\TaskProcessing\ISynchronousProvider; use OCP\TaskProcessing\ISynchronousProvider;
use OCP\TaskProcessing\Task; use OCP\TaskProcessing\Task;
@ -63,12 +57,21 @@ class SynchronousBackgroundJob extends QueuedJob {
} }
} }
// check if this job needs to be scheduled again:
// if there is at least one preferred synchronous provider that has a scheduled task
$synchronousProviders = array_filter($providers, fn ($provider) => $synchronousProviders = array_filter($providers, fn ($provider) =>
$provider instanceof ISynchronousProvider); $provider instanceof ISynchronousProvider);
$taskTypes = array_values(array_map(fn ($provider) => $synchronousPreferredProviders = array_filter($synchronousProviders, function ($provider) {
$provider->getTaskTypeId(), $taskTypeId = $provider->getTaskTypeId();
$synchronousProviders $preferredProvider = $this->taskProcessingManager->getPreferredProvider($taskTypeId);
)); return $provider->getId() === $preferredProvider->getId();
});
$taskTypes = array_values(
array_map(
fn ($provider) => $provider->getTaskTypeId(),
$synchronousPreferredProviders
)
);
$taskTypesWithTasks = array_filter($taskTypes, function ($taskType) { $taskTypesWithTasks = array_filter($taskTypes, function ($taskType) {
try { try {
$this->taskProcessingManager->getNextScheduledTask([$taskType]); $this->taskProcessingManager->getNextScheduledTask([$taskType]);