fix(FsActionService): Pass userId to bg job to allow finding nodes via user folder

plus make sure to tear down fs in between action processing to prevent OOM

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

lib/Db/FsActionMapper.php

@@ -180,17 +180,19 @@ public function insertAccessUpdate(int $storageId, int $rootId): Entity {
 	/**
 	 * @param int $storageId
 	 * @param int $rootId
+	 * @param string $userId
 	 * @return FsCreation|FsDeletion|FsMove|FsAccessUpdate
 	 * @throws Exception
 	 * @throws MultipleObjectsReturnedException
 	 */
-	public function insertCreation(int $storageId, int $rootId): Entity {
+	public function insertCreation(int $storageId, int $rootId, string $userId): Entity {
 		try {
 			$creation = $this->findByStorageIdAndRootId(FsCreation::class, $storageId, $rootId);
 		} catch (DoesNotExistException $e) {
 			$creation = new FsCreation();
 			$creation->setStorageId($storageId);
 			$creation->setRootId($rootId);
+			$creation->setUserId($userId);
 			$this->insert($creation);
 			$arguments = [ 'type' => FsCreation::class, 'storage_id' => $storageId ];
 			if (!$this->jobList->has(ProcessFsActionsJob::class, $arguments)) {

lib/Db/FsCreation.php

@@ -17,20 +17,23 @@
  * @method setStorageId(int $storageId)
  * @method int getRootId()
  * @method setRootId(int $rootId)
+ * @method string getUserId()
+ * @method setUserId(string $userId)
  */
 final class FsCreation extends Entity {
 	protected ?int $storageId = null;
 	protected ?int $rootId = null;
+	protected ?string $userId = null;
 
 	/**
 	 * @var string[]
 	 */
-	public static array $columns = ['id', 'storage_id', 'root_id'];
+	public static array $columns = ['id', 'storage_id', 'root_id', 'user_id'];
 
 	/**
 	 * @var string[]
 	 */
-	public static array $fields = ['id', 'storageId', 'rootId'];
+	public static array $fields = ['id', 'storageId', 'rootId', 'userId'];
 
 	public static string $tableName = 'recognize_fs_creations';
 
@@ -39,5 +42,6 @@ public function __construct() {
 		$this->addType('id', 'integer');
 		$this->addType('storageId', 'integer');
 		$this->addType('rootId', 'integer');
+		$this->addType('userId', 'string');
 	}
 }

lib/Hooks/FileListener.php

@@ -195,8 +195,8 @@ public function handle(Event $event): void {
 				return;
 			}
 			if ($event instanceof CacheEntryInsertedEvent) {
-				$node = current($this->rootFolder->getById($event->getFileId()));
-				if ($node === false) {
+				$node = $this->rootFolder->getFirstNodeById($event->getFileId());
+				if ($node === null) {
 					return;
 				}
 				if ($node instanceof Folder) {
@@ -214,8 +214,8 @@ public function handle(Event $event): void {
 				if ($cacheEntry === false) {
 					return;
 				}
-				$node = current($this->rootFolder->getById($cacheEntry->getId()));
-				if ($node === false) {
+				$node = $this->rootFolder->getFirstNodeById($cacheEntry->getId());
+				if ($node === null) {
 					return;
 				}
 				if (in_array($node->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
@@ -269,7 +269,12 @@ public function postInsert(Node $node, bool $recurse = true, ?array $mimeTypes =
 		if (preg_match('#^/[^/]*?/files($|/)#', $node->getPath()) !== 1 && preg_match('#^/groupfolders/#', $node->getPath()) !== 1) {
 			return;
 		}
-		$this->fsActionMapper->insertCreation($storageId, $node->getId());
+		$owner = $node->getOwner();
+		if ($owner === null) {
+			$this->logger->info('Node has no owner: ' . $node->getPath() . ' - Ignoring.');
+			return;
+		}
+		$this->fsActionMapper->insertCreation($storageId, $node->getId(), $owner->getUID());
 	}
 
 	/**

lib/Migration/Version011000001Date20251215094821.php

@@ -43,6 +43,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table->addColumn('id', Types::BIGINT, ['autoincrement' => true]);
 			$table->addColumn('storage_id', Types::BIGINT, ['notnull' => true]);
 			$table->addColumn('root_id', Types::BIGINT, ['notnull' => true]);
+			$table->addColumn('user_id', Types::STRING, ['notnull' => true]);
 			$table->setPrimaryKey(['id'], 'recognize_fs_cr_pk');
 			$table->addUniqueIndex(['storage_id', 'root_id'], 'recognize_fs_cr_unique');
 			$changed = true;

lib/Service/FsActionService.php

@@ -2,6 +2,8 @@
 
 namespace OCA\Recognize\Service;
 
+use OC\Files\SetupManager;
+use OC\User\NoUserException;
 use OCA\Recognize\BackgroundJobs\ClusterFacesJob;
 use OCA\Recognize\Classifiers\Audio\MusicnnClassifier;
 use OCA\Recognize\Classifiers\Images\ClusteringFaceClassifier;
@@ -25,6 +27,7 @@
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use Psr\Log\LoggerInterface;
 
 final class FsActionService {
@@ -72,10 +75,25 @@ public function processActionsByClass(string $className): void {
 	 * @param array<FsCreation|FsDeletion|FsMove|FsAccessUpdate> $actions
 	 */
 	public function processActions(array $actions): void {
+		$lastUserId = null;
 		foreach ($actions as $action) {
 			switch ($action::class) {
 				case FsCreation::class:
-					$rootNode = $this->rootFolder->getFirstNodeById($action->getRootId());
+					$this->logger->debug('Processing FsCreation action for storageId ' . $action->getStorageId() . ' and rootId ' . $action->getRootId());
+					// Tear down to avoid memory leaks and OOMs
+					// The fs event table is sorted by user ID, so we only need to tear down when the user ID changes
+					$actionUserId = $action->getUserId();
+					if ($actionUserId !== $lastUserId) {
+						$lastUserId = $actionUserId;
+						$setupManager = \OCP\Server::get(SetupManager::class);
+						$setupManager->tearDown();
+					}
+					try {
+						$rootNode = $this->rootFolder->getUserFolder($actionUserId)->getFirstNodeById($action->getRootId());
+					} catch (NotPermittedException|NoUserException $e) {
+						$this->logger->warning('Failed to find root node for creation action: ' . $e->getMessage(), ['exception' => $e]);
+						break;
+					}
 					if ($rootNode === null) {
 						$this->logger->info('Failed to find root node for creation action', ['nodeId' => $action->getRootId(), 'storageId' => $action->getStorageId()]);
 						break;
@@ -88,16 +106,19 @@ public function processActions(array $actions): void {
 					break;
 
 				case FsDeletion::class:
+					$this->logger->debug('Processing FsDeletion action for nodeId ' . $action->getNodeId());
 					$this->onDeletion($action->getNodeId()); // todo add mimetypes filter here
 					break;
 				case FsAccessUpdate::class:
+					$this->logger->debug('Processing FsAccessUpdate action for storageId ' . $action->getStorageId() . ' and rootId ' . $action->getRootId());
 					try {
 						$this->onAccessUpdate($action->getStorageId(), $action->getRootId());
 					} catch (Exception|InvalidPathException|NotFoundException $e) {
 						$this->logger->warning('Failed to process access update action: ' . $e->getMessage() . ' Continuing.', ['exception' => $e]);
 					}
 					break;
 				case FsMove::class:
+					$this->logger->debug('Processing FsMove action for nodeId ' . $action->getNodeId());
 					$node = $this->rootFolder->getFirstNodeById($action->getNodeId());
 					if ($node === null) {
 						$this->logger->info('Failed to find root node for move action', ['nodeId' => $action->getNodeId()]);
@@ -202,12 +223,14 @@ public function onCreation(Node $node, bool $recurse = true, ?array $mimeTypes =
 		$queueFile = new QueueFile();
 		$storageId = $node->getMountPoint()->getNumericStorageId();
 		if ($storageId === null) {
+			$this->logger->debug('Storage ID is null for node ' . $node->getId());
 			return;
 		}
 		$queueFile->setStorageId($storageId);
 		$queueFile->setRootId($node->getMountPoint()->getStorageRootId());
 
 		if ($this->isFileIgnored($node)) {
+			$this->logger->debug('File ignored, skipping: ' . $node->getId());
 			return;
 		}