Merge pull request #32048 from nextcloud/cache-storage-info

cache storage info in memcache for 5m
pull/32069/head
John Molakvoæ 3 years ago committed by GitHub
commit 3f55108227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      lib/private/legacy/OC_Helper.php

@ -44,7 +44,9 @@
* *
*/ */
use bantu\IniGetWrapper\IniGetWrapper; use bantu\IniGetWrapper\IniGetWrapper;
use OC\Files\Filesystem;
use OCP\Files\Mount\IMountPoint; use OCP\Files\Mount\IMountPoint;
use OCP\ICacheFactory;
use OCP\IUser; use OCP\IUser;
use Symfony\Component\Process\ExecutableFinder; use Symfony\Component\Process\ExecutableFinder;
@ -486,9 +488,20 @@ class OC_Helper {
* @throws \OCP\Files\NotFoundException * @throws \OCP\Files\NotFoundException
*/ */
public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true) { public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true) {
/** @var ICacheFactory $cacheFactory */
$cacheFactory = \OC::$server->get(ICacheFactory::class);
$memcache = $cacheFactory->createLocal('storage_info');
// return storage info without adding mount points // return storage info without adding mount points
$includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false); $includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
$fullPath = Filesystem::getView()->getAbsolutePath($path);
$cacheKey = $fullPath. '::' . ($includeMountPoints ? 'include' : 'exclude');
$cached = $memcache->get($cacheKey);
if ($cached) {
return $cached;
}
if (!$rootInfo) { if (!$rootInfo) {
$rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false); $rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false);
} }
@ -559,7 +572,7 @@ class OC_Helper {
[,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4); [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
} }
return [ $info = [
'free' => $free, 'free' => $free,
'used' => $used, 'used' => $used,
'quota' => $quota, 'quota' => $quota,
@ -570,6 +583,10 @@ class OC_Helper {
'mountType' => $mount->getMountType(), 'mountType' => $mount->getMountType(),
'mountPoint' => trim($mountPoint, '/'), 'mountPoint' => trim($mountPoint, '/'),
]; ];
$memcache->set($cacheKey, $info, 5 * 60);
return $info;
} }
/** /**

Loading…
Cancel
Save