upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #57578 from nextcloud/authoritative-setup-improvements

Browse source 
Authoritative setup improvements
This commit is contained in:
Robin Appelman 2026-02-18 16:59:16 +01:00 committed by GitHub
commit d504ec1ec5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/private/Files/SetupManager.php
View file

@ -72,6 +72,8 @@ class SetupManager implements ISetupManager {
private array $setupUsers = [];
// List of users for which all mounts are setup
private array $setupUsersComplete = [];
// List of users for which we've already refreshed the non-authoritative mounts
private array $usersMountsUpdated = [];
/**
* An array of provider classes that have been set up, indexed by UserUID.
*
@ -237,6 +239,10 @@ class SetupManager implements ISetupManager {
* Update the cached mounts for all non-authoritative mount providers for a user.
*/
private function updateNonAuthoritativeProviders(IUser $user): void {
if (isset($this->usersMountsUpdated[$user->getUID()])) {
return;
}
// prevent recursion loop from when getting mounts from providers ends up setting up the filesystem
static $updatingProviders = false;
if ($updatingProviders) {
@ -257,6 +263,7 @@ class SetupManager implements ISetupManager {
$mount = $this->mountProviderCollection->getUserMountsForProviderClasses($user, $providerNames);
$this->userMountCache->registerMounts($user, $mount, $providerNames);
$this->usersMountsUpdated[$user->getUID()] = true;
$updatingProviders = false;
}
@ -680,8 +687,13 @@ class SetupManager implements ISetupManager {
}
if (!$providersAreAuthoritative && $this->fullSetupRequired($user)) {
$this->setupForUser($user);
return;
if ($this->optimizeAuthoritativeProviders) {
$this->updateNonAuthoritativeProviders($user);
$this->markUserMountsCached($user);
} else {
$this->setupForUser($user);
return;
}
}
$this->eventLogger->start('fs:setup:user:providers', 'Setup filesystem for ' . implode(', ', $providers));
@ -726,6 +738,7 @@ class SetupManager implements ISetupManager {
$this->setupUserMountProviders = [];
$this->setupMountProviderPaths = [];
$this->fullSetupRequired = [];
$this->usersMountsUpdated = [];
$this->rootSetup = false;
$this->mountManager->clear();
$this->userMountCache->clear();