Skip to content

[30][wip] reduce memory usage for fetching cached mount into #51075

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

Closed
icewind1991 wants to merge 7 commits into from
Closed

[30][wip] reduce memory usage for fetching cached mount into #51075

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
415e236
fix: optimize FileUtils::getFilesByUser
icewind1991 Mar 5, 2025
8d25706
fix: fix getNodeFromCacheEntryAndMount using relative path
icewind1991 Mar 10, 2025
66c2b81
fix: reduce memory usage for fetching cached mount into
icewind1991 Feb 26, 2025
786fd2b
fix: improve getMountsForFileId memory usage and performance
icewind1991 Mar 6, 2025
da772b2
fix: fix "new mount" false positives
icewind1991 Mar 7, 2025
caf2279
fix: skip registering mounts if there are no new mount providers
icewind1991 Mar 7, 2025
48dc7ed
fix: fix oci string length with empty strings
icewind1991 Mar 13, 2025
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
Prev Previous commit
Next Next commit
fix: skip registering mounts if there are no new mount providers 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Mar 19, 2025
commit caf2279507a83de762041d96e760832a8e8ddcc5
18 changes: 10 additions & 8 deletions lib/private/Files/SetupManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,18 +271,20 @@ private function oneTimeUserSetup(IUser $user) {
private function afterUserFullySetup(IUser $user, array $previouslySetupProviders): void {
$this->eventLogger->start('fs:setup:user:full:post', 'Housekeeping after user is setup');
$userRoot = '/' . $user->getUID() . '/';
$mounts = $this->mountManager->getAll();
$mounts = array_filter($mounts, function (IMountPoint $mount) use ($userRoot) {
return str_starts_with($mount->getMountPoint(), $userRoot);
});
$allProviders = array_map(function ($provider) {
return get_class($provider);
}, array_merge($this->mountProviderCollection->getProviders(), $this->mountProviderCollection->getHomeProviders()));
$newProviders = array_diff($allProviders, $previouslySetupProviders);
$mounts = array_filter($mounts, function (IMountPoint $mount) use ($previouslySetupProviders) {
return !in_array($mount->getMountProvider(), $previouslySetupProviders);
});
$this->userMountCache->registerMounts($user, $mounts, $newProviders);
if (count($newProviders) > 0) {
$mounts = $this->mountManager->getAll();
$mounts = array_filter($mounts, function (IMountPoint $mount) use ($userRoot, $previouslySetupProviders) {
if (!str_starts_with($mount->getMountPoint(), $userRoot)) {
return false;
}
return !in_array($mount->getMountProvider(), $previouslySetupProviders);
});
$this->userMountCache->registerMounts($user, $mounts, $newProviders);
}

$cacheDuration = $this->config->getSystemValueInt('fs_mount_cache_duration', 5 * 60);
if ($cacheDuration > 0) {
Expand Down