diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/TaskProcessingApiController.php | 44 | ||||
| -rw-r--r-- | core/l10n/lv.js | 2 | ||||
| -rw-r--r-- | core/l10n/lv.json | 2 |
3 files changed, 38 insertions, 10 deletions
diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php index e60c9ebc789..90a0e9ba14a 100644 --- a/core/Controller/TaskProcessingApiController.php +++ b/core/Controller/TaskProcessingApiController.php @@ -575,23 +575,51 @@ class TaskProcessingApiController extends OCSController { #[ApiRoute(verb: 'GET', url: '/tasks_provider/next', root: '/taskprocessing')] public function getNextScheduledTask(array $providerIds, array $taskTypeIds): DataResponse { try { + $providerIdsBasedOnTaskTypesWithNull = array_unique(array_map(function ($taskTypeId) { + try { + return $this->taskProcessingManager->getPreferredProvider($taskTypeId)->getId(); + } catch (Exception) { + return null; + } + }, $taskTypeIds)); + + $providerIdsBasedOnTaskTypes = array_filter($providerIdsBasedOnTaskTypesWithNull, fn ($providerId) => $providerId !== null); + // restrict $providerIds to providers that are configured as preferred for the passed task types - $providerIds = array_values(array_intersect(array_unique(array_map(fn ($taskTypeId) => $this->taskProcessingManager->getPreferredProvider($taskTypeId)->getId(), $taskTypeIds)), $providerIds)); + $possibleProviderIds = array_values(array_intersect($providerIdsBasedOnTaskTypes, $providerIds)); + // restrict $taskTypeIds to task types that can actually be run by one of the now restricted providers - $taskTypeIds = array_values(array_filter($taskTypeIds, fn ($taskTypeId) => in_array($this->taskProcessingManager->getPreferredProvider($taskTypeId)->getId(), $providerIds, true))); - if (count($providerIds) === 0 || count($taskTypeIds) === 0) { + $possibleTaskTypeIds = array_values(array_filter($taskTypeIds, function ($taskTypeId) use ($possibleProviderIds) { + try { + $providerForTaskType = $this->taskProcessingManager->getPreferredProvider($taskTypeId)->getId(); + } catch (Exception) { + // no provider found for task type + return false; + } + return in_array($providerForTaskType, $possibleProviderIds, true); + })); + + if (count($possibleProviderIds) === 0 || count($possibleTaskTypeIds) === 0) { throw new NotFoundException(); } $taskIdsToIgnore = []; while (true) { - $task = $this->taskProcessingManager->getNextScheduledTask($taskTypeIds, $taskIdsToIgnore); - $provider = $this->taskProcessingManager->getPreferredProvider($task->getTaskTypeId()); - if (in_array($provider->getId(), $providerIds, true)) { - if ($this->taskProcessingManager->lockTask($task)) { - break; + // Until we find a task whose task type is set to be provided by the providers requested with this request + // Or no scheduled task is found anymore (given the taskIds to ignore) + $task = $this->taskProcessingManager->getNextScheduledTask($possibleTaskTypeIds, $taskIdsToIgnore); + try { + $provider = $this->taskProcessingManager->getPreferredProvider($task->getTaskTypeId()); + if (in_array($provider->getId(), $possibleProviderIds, true)) { + if ($this->taskProcessingManager->lockTask($task)) { + break; + } } + } catch (Exception) { + // There is no provider set for the task type of this task + // proceed to ignore this task } + $taskIdsToIgnore[] = (int)$task->getId(); } diff --git a/core/l10n/lv.js b/core/l10n/lv.js index 02e39fc7ab9..3c50e94a918 100644 --- a/core/l10n/lv.js +++ b/core/l10n/lv.js @@ -123,7 +123,7 @@ OC.L10N.register( "Search in" : "Meklēt", "Log in" : "Pieteikties", "Logging in …" : "Notiek pieteikšanās …", - "Log in to {productName}" : "Pierakstīties {productName}", + "Log in to {productName}" : "Pieteikties {productName}", "Wrong login or password." : "Nepareizs lietotājvārds vai parole.", "This account is disabled" : "Šis konts ir atspējots", "Account name or email" : "Konta nosaukums vai e-pasta adrese", diff --git a/core/l10n/lv.json b/core/l10n/lv.json index 79a46948eef..3a19a70d965 100644 --- a/core/l10n/lv.json +++ b/core/l10n/lv.json @@ -121,7 +121,7 @@ "Search in" : "Meklēt", "Log in" : "Pieteikties", "Logging in …" : "Notiek pieteikšanās …", - "Log in to {productName}" : "Pierakstīties {productName}", + "Log in to {productName}" : "Pieteikties {productName}", "Wrong login or password." : "Nepareizs lietotājvārds vai parole.", "This account is disabled" : "Šis konts ir atspējots", "Account name or email" : "Konta nosaukums vai e-pasta adrese", |