Use a capped memory cache for the user/group cache

For #24403
When upgrading huge installations this can lead to memory problems as
the cache will only grow and grow.

Capping this memory will make sure we don't run out while during normal
operation still basically cache everything.
This commit is contained in:
Roeland Jago Douma 2016-06-01 21:31:14 +02:00
parent 96bf7f5513
commit 0efe3ba62e
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
1 changed files with 6 additions and 2 deletions

View File

@ -36,6 +36,7 @@ namespace OCA\user_ldap;
use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\BackendUtility;
use OC\Cache\CappedMemoryCache;
class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
protected $enabled = false;
@ -43,12 +44,12 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
/**
* @var string[] $cachedGroupMembers array of users with gid as key
*/
protected $cachedGroupMembers = array();
protected $cachedGroupMembers;
/**
* @var string[] $cachedGroupsByMember array of groups with uid as key
*/
protected $cachedGroupsByMember = array();
protected $cachedGroupsByMember;
public function __construct(Access $access) {
parent::__construct($access);
@ -57,6 +58,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
if(!empty($filter) && !empty($gassoc)) {
$this->enabled = true;
}
$this->cachedGroupMembers = new CappedMemoryCache();
$this->cachedGroupsByMember = new CappedMemoryCache();
}
/**