Merge pull request #149 from nextcloud/fix/db-stress

fix: reduce db and cron load

Author: marcelklehr

lib/BackgroundJobs/FileSystemListenerJob.php

@@ -17,10 +17,10 @@
 use OCP\App\IAppManager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
-use OCP\BackgroundJob\QueuedJob;
+use OCP\BackgroundJob\TimedJob;
 use OCP\Files\IRootFolder;
 
-class FileSystemListenerJob extends QueuedJob {
+class FileSystemListenerJob extends TimedJob {
 	private const BATCH_SIZE = 500;
 
 	public function __construct(
@@ -34,6 +34,8 @@ public function __construct(
 		private IRootFolder $rootFolder,
 	) {
 		parent::__construct($timeFactory);
+		$this->allowParallelRuns = false;
+		$this->setInterval(5 * 60); // 5 minutes
 	}
 
 	protected function run($argument): void {
@@ -50,40 +52,37 @@ protected function run($argument): void {
 			return;
 		}
 
-		try {
-			foreach ($fsEvents as $fsEvent) {
-				$this->diagnosticService->sendHeartbeat(static::class, $this->getId());
+		foreach ($fsEvents as $fsEvent) {
+			$this->diagnosticService->sendHeartbeat(static::class, $this->getId());
 
-				try {
-					$node = current($this->rootFolder->getUserFolder($fsEvent->getUserId())->getById($fsEvent->getNodeId()));
-					if ($node === false) {
-						$this->logger->warning('Node with ID ' . $fsEvent->getNodeId() . ' not found for fs event "' . $fsEvent->getType() . '"');
-						$this->fsEventMapper->delete($fsEvent);
-						continue;
-					}
+			try {
+				$node = current($this->rootFolder->getUserFolder($fsEvent->getUserId())->getById($fsEvent->getNodeId()));
+			} catch (\Exception $e) {
+				$this->logger->warning('Error retrieving node for fs event "' . $fsEvent->getType() . '": ' . $e->getMessage(), ['exception' => $e]);
+				$node = false;
+			}
+			if ($node === false) {
+				$this->logger->warning('Node with ID ' . $fsEvent->getNodeId() . ' not found for fs event "' . $fsEvent->getType() . '"');
+				$this->fsEventMapper->delete($fsEvent);
+				continue;
+			}
 
-					switch ($fsEvent->getTypeObject()) {
-						case FsEventType::CREATE:
-							$this->fsEventService->onInsert($node);
-							break;
-						case FsEventType::ACCESS_UPDATE_DECL:
-							$this->fsEventService->onAccessUpdateDecl($node);
-							break;
-					}
-					$this->diagnosticService->sendHeartbeat(static::class, $this->getId());
-					$this->fsEventMapper->delete($fsEvent);
-				} catch (\RuntimeException $e) {
-					$this->logger->warning('Error handling fs event "' . $fsEvent->getType() . '": ' . $e->getMessage(), ['exception' => $e]);
+			try {
+				switch ($fsEvent->getTypeObject()) {
+					case FsEventType::CREATE:
+						$this->fsEventService->onInsert($node);
+						break;
+					case FsEventType::ACCESS_UPDATE_DECL:
+						$this->fsEventService->onAccessUpdateDecl($node);
+						break;
 				}
+				$this->diagnosticService->sendHeartbeat(static::class, $this->getId());
+				$this->fsEventMapper->delete($fsEvent);
+			} catch (\RuntimeException $e) {
+				$this->logger->warning('Error handling fs event "' . $fsEvent->getType() . '": ' . $e->getMessage(), ['exception' => $e]);
 			}
-		} catch (\Throwable $e) {
-			// schedule in 5mins
-			$this->jobList->scheduleAfter(static::class, $this->time->getTime() + 5 * 60);
-			throw $e;
 		}
 
-		// schedule in 5mins
-		$this->jobList->scheduleAfter(static::class, $this->time->getTime() + 5 * 60);
 		$this->diagnosticService->sendJobEnd(static::class, $this->getId());
 	}
 }

lib/Service/FsEventScheduler.php

@@ -7,7 +7,6 @@
 
 namespace OCA\ContextChat\Service;
 
-use OCA\ContextChat\BackgroundJobs\FileSystemListenerJob;
 use OCA\ContextChat\Db\FsEvent;
 use OCA\ContextChat\Db\FsEventMapper;
 use OCA\ContextChat\Type\FsEventType;
@@ -52,10 +51,6 @@ private function scheduleEvent(FsEventType $type, string $userId, int $nodeId):
 
 		// do not catch DB exceptions
 		$this->fsEventMapper->insert($item);
-
-		if (!$this->jobList->has(FileSystemListenerJob::class, null)) {
-			$this->jobList->add(FileSystemListenerJob::class, null);
-		}
 	}
 
 	/**