mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set up FS before querying storage info in settings 

The personal info section of the personal settings is querying the
storage quota information. For this it requires the FS to be setup which
is not always guaranteed.

This fixes an issue where refreshing the settings page would cause it to
fail after Redis caches are full. It is likely that when Redis cache is
populated, some code path is initializing the FS, so it works so far.
But when the cache is populated, that code path is skipped so the FS is
not guaranteed to be setup...

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
This commit is contained in:
Vincent Petry 2020-11-13 16:52:08 +01:00 committed by backportbot[bot]
parent 7a821da1bc
commit 32758894a4
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/settings/lib/Settings/Personal/PersonalInfo.php
View File

@ -105,6 +105,9 @@ class PersonalInfo implements ISettings {
$user = $this->userManager->get($uid); $user = $this->userManager->get($uid);
$userData = $this->accountManager->getUser($user); $userData = $this->accountManager->getUser($user);
// make sure FS is setup before querying storage related stuff...
\OC_Util::setupFS($user->getUID());
$storageInfo = \OC_Helper::getStorageInfo('/'); $storageInfo = \OC_Helper::getStorageInfo('/');
if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) { if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
$totalSpace = $this->l->t('Unlimited'); $totalSpace = $this->l->t('Unlimited');

3
lib/private/legacy/OC_Helper.php
View File

@ -475,6 +475,9 @@ class OC_Helper {
/** /**
* Calculate the disc space for the given path * Calculate the disc space for the given path
* *
* BEWARE: this requires that Util::setupFS() was called
* already !
*
* @param string $path * @param string $path
* @param \OCP\Files\FileInfo $rootInfo (optional) * @param \OCP\Files\FileInfo $rootInfo (optional)
* @return array * @return array