Merge pull request #6555 from LibreSign/backport/6551/stable32

[stable32] feat: optimize worker initialization

Author: vitormattos

lib/Controller/FileProgressController.php

@@ -18,7 +18,7 @@
 use OCA\Libresign\Service\FileService;
 use OCA\Libresign\Service\SessionService;
 use OCA\Libresign\Service\SignRequest\ProgressService;
-use OCA\Libresign\Service\WorkerHealthService;
+use OCA\Libresign\Service\Worker\WorkerHealthService;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;

lib/Controller/SignFileController.php

@@ -23,7 +23,7 @@
 use OCA\Libresign\Service\IdentifyMethodService;
 use OCA\Libresign\Service\RequestMetadataService;
 use OCA\Libresign\Service\SignFileService;
-use OCA\Libresign\Service\WorkerHealthService;
+use OCA\Libresign\Service\Worker\WorkerHealthService;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;

lib/Service/AsyncSigningService.php

@@ -13,6 +13,7 @@
 use OCA\Libresign\Db\FileMapper;
 use OCA\Libresign\Db\SignRequest;
 use OCA\Libresign\Enum\FileStatus;
+use OCA\Libresign\Service\Worker\WorkerHealthService;
 use OCP\BackgroundJob\IJobList;
 use OCP\IUser;
 use OCP\Security\ICredentialsManager;

lib/Service/Worker/WorkerHealthService.php

@@ -12,17 +12,22 @@
 
 class WorkerHealthService {
 	public function __construct(
-		private WorkerConfiguration $config,
-		private WorkerCounter $counter,
-		private StartThrottlePolicy $throttle,
-		private WorkerStarter $starter,
+		private WorkerConfiguration $workerConfiguration,
+		private WorkerCounter $workerCounter,
+		private WorkerJobCounter $workerJobCounter,
+		private StartThrottlePolicy $startThrottlePolicy,
+		private WorkerStarter $workerStarter,
 		private LoggerInterface $logger,
 	) {
 	}
 
+	public function isAsyncLocalEnabled(): bool {
+		return $this->workerConfiguration->isAsyncLocalEnabled();
+	}
+
 	public function ensureWorkerRunning(): bool {
 		try {
-			if (!$this->config->isAsyncLocalEnabled()) {
+			if (!$this->workerConfiguration->isAsyncLocalEnabled()) {
 				return false;
 			}
 
@@ -31,12 +36,12 @@ public function ensureWorkerRunning(): bool {
 				return true;
 			}
 
-			if ($this->throttle->isThrottled()) {
+			if ($this->startThrottlePolicy->isThrottled()) {
 				return true;
 			}
 
-			$this->throttle->recordAttempt();
-			$this->starter->startWorkers($workersNeeded);
+			$this->startThrottlePolicy->recordAttempt();
+			$this->workerStarter->startWorkers($workersNeeded);
 			return true;
 		} catch (\Throwable $e) {
 			$this->logger->error('Failed to ensure worker is running: {error}', [
@@ -48,8 +53,24 @@ public function ensureWorkerRunning(): bool {
 	}
 
 	private function calculateWorkersNeeded(): int {
-		$desired = $this->config->getDesiredWorkerCount();
-		$running = $this->counter->countRunning();
-		return max(0, $desired - $running);
+		$desired = $this->workerConfiguration->getDesiredWorkerCount();
+		$running = $this->workerCounter->countRunning();
+		$pendingJobs = $this->workerJobCounter->countPendingJobs();
+
+		if ($this->hasNoPendingWork($pendingJobs)) {
+			return 0;
+		}
+
+		return $this->limitWorkersByAvailableWork($pendingJobs, $desired, $running);
+	}
+
+	private function hasNoPendingWork(int $pendingJobs): bool {
+		return $pendingJobs === 0;
+	}
+
+	private function limitWorkersByAvailableWork(int $pendingJobs, int $desired, int $running): int {
+		$workersNeeded = $desired - $running;
+		$workersLimitedByJobs = min($pendingJobs, $workersNeeded);
+		return max(0, $workersLimitedByJobs);
 	}
 }

lib/Service/Worker/WorkerJobCounter.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2026 LibreCode coop and contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Libresign\Service\Worker;
+
+use OCA\Libresign\BackgroundJob\SignFileJob;
+use OCA\Libresign\BackgroundJob\SignSingleFileJob;
+use OCP\BackgroundJob\IJobList;
+use Psr\Log\LoggerInterface;
+
+class WorkerJobCounter {
+	public function __construct(
+		private IJobList $jobList,
+		private LoggerInterface $logger,
+	) {
+	}
+
+	public function countPendingJobs(): int {
+		try {
+			$counts = $this->jobList->countByClass();
+			$total = 0;
+
+			foreach ($counts as $row) {
+				if ($row['class'] === SignFileJob::class || $row['class'] === SignSingleFileJob::class) {
+					$total += $row['count'];
+				}
+			}
+
+			return $total;
+		} catch (\Throwable $e) {
+			$this->logger->debug('Failed to count pending jobs', [
+				'error' => $e->getMessage(),
+			]);
+			return 0;
+		}
+	}
+}

lib/Service/Worker/WorkerStarter.php

@@ -43,7 +43,7 @@ private function clampWorkerCount(int $count): int {
 	private function executeCommand(string $phpPath, string $occPath, array $jobClasses): void {
 		$jobClassesArg = implode(' ', array_map('escapeshellarg', $jobClasses));
 		$cmd = sprintf(
-			'%s %s background-job:worker %s --stop_after=1h >> /dev/null 2>&1 &',
+			'%s %s background-job:worker %s --stop_after=30m >> /dev/null 2>&1 &',
 			escapeshellarg($phpPath),
 			escapeshellarg($occPath),
 			$jobClassesArg