Merge pull request #35308 from nextcloud/bugfix/34961/user-mgmt-quota…

…-no-cache Don't use quota cache through user management
nextcloud · Nov 21, 2022 · 09345f7 · 09345f7
2 parents 83badcb + 0b09531
commit 09345f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
@@ -245,7 +245,7 @@ protected function fillStorageInfo(string $userId): array {
 		try {
 			\OC_Util::tearDownFS();
 			\OC_Util::setupFS($userId);
-			$storage = OC_Helper::getStorageInfo('/');
+			$storage = OC_Helper::getStorageInfo('/', null, true, false);
 			$data = [
 				'free' => $storage['free'],
 				'used' => $storage['used'],

diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php
@@ -457,10 +457,12 @@ public static function findBinaryPath(string $program): ?string {
 	 *
 	 * @param string $path
 	 * @param \OCP\Files\FileInfo $rootInfo (optional)
+	 * @param bool $includeMountPoints whether to include mount points in the size calculation
+	 * @param bool $useCache whether to use the cached quota values
 	 * @return array
 	 * @throws \OCP\Files\NotFoundException
 	 */
-	public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true) {
+	public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true, $useCache = true) {
 		/** @var ICacheFactory $cacheFactory */
 		$cacheFactory = \OC::$server->get(ICacheFactory::class);
 		$memcache = $cacheFactory->createLocal('storage_info');
@@ -470,9 +472,11 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
 
 		$fullPath = Filesystem::getView()->getAbsolutePath($path);
 		$cacheKey = $fullPath. '::' . ($includeMountPoints ? 'include' : 'exclude');
-		$cached = $memcache->get($cacheKey);
-		if ($cached) {
-			return $cached;
+		if ($useCache) {
+			$cached = $memcache->get($cacheKey);
+			if ($cached) {
+				return $cached;
+			}
 		}
 
 		if (!$rootInfo) {