Skip to content

perf(FsEventScheduler): Make sure to get node owner from caller, if possible #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcelklehr merged 2 commits into from
Jan 27, 2026
Merged

perf(FsEventScheduler): Make sure to get node owner from caller, if possible #206

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24b9656
perf(FsEventScheduler): Make sure to get node owner from caller, if p…
marcelklehr Jan 27, 2026
b496d5f
fix(FsEventScheduler): Add parameter type
marcelklehr Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Listener/FileListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public function handle(Event $event): void {
if ($event instanceof \OCP\Files\Config\Event\UserMountAddedEvent) {
$rootId = $event->mountPoint->getRootId();
// Asynchronous, because we potentially recurse and this event needs to be handled fast
$this->fsEventScheduler->onAccessUpdateDecl($rootId);
$this->fsEventScheduler->onAccessUpdateDecl($rootId, $event->mountPoint->getUser()->getUID());
// Remember that this mount was added in the current process (see UserMountRemovedEvent below)
$this->addedMounts[$event->mountPoint->getUser()->getUID() . '-' . $rootId] = true;
}
Expand All @@ -130,7 +130,7 @@ public function handle(Event $event): void {
return;
}
// Asynchronous, because we potentially recurse and this event needs to be handled fast
$this->fsEventScheduler->onAccessUpdateDecl($rootId);
$this->fsEventScheduler->onAccessUpdateDecl($rootId, $event->mountPoint->getUser()->getUID());
}
} catch (InvalidPathException|Exception|NotFoundException $e) {
$this->logger->warning('Error in fs event listener: ' . $e->getMessage(), ['exception' => $e]);
Expand Down
10 changes: 6 additions & 4 deletions lib/Service/FsEventScheduler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,12 @@ private function retractEvent(FsEventType $type, string $ownerId, int $nodeId) {
* @throws NotFoundException
* @throws Exception
*/
public function onAccessUpdateDecl(int $nodeId): void {
$ownerId = $this->storageService->getOwnerForFileId($nodeId);
if ($ownerId === false) {
throw new NotFoundException('Cannot get owner for file ID ' . $nodeId);
public function onAccessUpdateDecl(int $nodeId, $ownerId = null): void {
if ($ownerId === null) {
$ownerId = $this->storageService->getOwnerForFileId($nodeId);
if ($ownerId === false) {
throw new NotFoundException('Cannot get owner for file ID ' . $nodeId);
}
}
$this->scheduleEvent(FsEventType::ACCESS_UPDATE_DECL, $ownerId, $nodeId);
}
Expand Down
Loading