Merge pull request #44061 from nextcloud/revert-32163-file-cache-gc-n…

…o-full-setup Revert "don't perform an explicit setup when using the file cache"
nextcloud · Mar 7, 2024 · 7b7fc30 · 7b7fc30
2 parents be3449c + 951c330
commit 7b7fc30
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php
@@ -29,6 +29,7 @@
  */
 namespace OC\Cache;
 
+use OC\Files\Filesystem;
 use OC\Files\View;
 use OCP\ICache;
 use OCP\Security\ISecureRandom;
@@ -52,6 +53,7 @@ protected function getStorage() {
  if (\OC::$server->getUserSession()->isLoggedIn()) {
  $rootView = new View();
  $user = \OC::$server->getUserSession()->getUser();
+ Filesystem::initMountPoints($user->getUID());
  if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
  $rootView->mkdir('/' . $user->getUID() . '/cache');
  }

diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
@@ -95,7 +95,7 @@ public function registerMounts(IUser $user, array $mounts, array $mountProviderC
 
  $cachedMounts = $this->getMountsForUser($user);
  if (is_array($mountProviderClasses)) {
- $cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts): bool {
+ $cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
  // for existing mounts that didn't have a mount provider set
  // we still want the ones that map to new mounts
  if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountInfo->getKey()])) {

diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -82,14 +82,6 @@ public function __construct($params) {
  if (isset($params['validateWrites'])) {
  $this->validateWrites = (bool)$params['validateWrites'];
  }
-
- // home storage is setup in the SetupManager
- if (!$this instanceof HomeObjectStoreStorage) {
- //initialize cache with root directory in cache
- if (!$this->is_dir('/')) {
- $this->mkdir('/');
- }
- }
  $this->handleCopiesAsOwned = (bool)($params['handleCopiesAsOwned'] ?? false);
 
  $this->logger = \OCP\Server::get(LoggerInterface::class);

diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
@@ -257,21 +257,10 @@ private function oneTimeUserSetup(IUser $user) {
 
  if ($homeMount->getStorageRootId() === -1) {
  $this->eventLogger->start('fs:setup:user:home:scan', 'Scan home filesystem for user');
- $homeStorage = $homeMount->getStorage();
- $homeStorage->mkdir('');
- $homeStorage->mkdir('files');
- $homeStorage->getScanner()->scan('');
+ $homeMount->getStorage()->mkdir('');
+ $homeMount->getStorage()->getScanner()->scan('');
  $this->eventLogger->end('fs:setup:user:home:scan');
  }
-
- $provider = $homeMount->getMountProvider();
- $this->userMountCache->registerMounts($user, [$homeMount], [$provider]);
- if (!isset($this->setupUserMountProviders[$user->getUID()])) {
- $this->setupUserMountProviders[$user->getUID()] = [];
- }
- if (!in_array($provider, $this->setupUserMountProviders[$user->getUID()])) {
- $this->setupUserMountProviders[$user->getUID()][] = $provider;
- }
  $this->eventLogger->end('fs:setup:user:home');
  } else {
  $this->mountManager->addMount(new MountPoint(