wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24111 from owncloud/chunk-users-in-background-jobs

Browse source 
Chunk the users correctly in the trashbin and versions background job
This commit is contained in:
Björn Schießle 2016-04-21 14:26:41 +02:00
commit 80959ad95a
3 changed files with 26 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apps/files_trashbin/lib/backgroundjob/expiretrash.php
View file

@ -23,6 +23,7 @@
namespace OCA\Files_Trashbin\BackgroundJob;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserManager;
use OCA\Files_Trashbin\AppInfo\Application;
use OCA\Files_Trashbin\Expiration;
@ -31,40 +32,28 @@ use OCA\Files_Trashbin\Trashbin;
class ExpireTrash extends \OC\BackgroundJob\TimedJob {
const ITEMS_PER_SESSION = 1000;
/**
* @var Expiration
*/
private $expiration;
/**
* @var IConfig
*/
private $config;
/**
* @var IUserManager
*/
private $userManager;
const USERS_PER_SESSION = 1000;
/**
* @param IConfig|null $config
* @param IUserManager|null $userManager
* @param Expiration|null $expiration
*/
public function __construct(IConfig $config = null,
IUserManager $userManager = null,
public function __construct(IUserManager $userManager = null,
Expiration $expiration = null) {
// Run once per 30 minutes
$this->setInterval(60 * 30);
if (is_null($expiration) || is_null($userManager) || is_null($config)) {
if (is_null($expiration) || is_null($userManager)) {
$this->fixDIForJobs();
} else {
$this->config = $config;
$this->userManager = $userManager;
$this->expiration = $expiration;
}
@ -72,7 +61,6 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
protected function fixDIForJobs() {
$application = new Application();
$this->config = \OC::$server->getConfig();
$this->userManager = \OC::$server->getUserManager();
$this->expiration = $application->getContainer()->query('Expiration');
}
@ -87,25 +75,14 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
return;
}
$offset = $this->config->getAppValue('files_trashbin', 'cronjob_user_offset', 0);
$users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
if (!count($users)) {
// No users found, reset offset and retry
$offset = 0;
$users = $this->userManager->search('', self::USERS_PER_SESSION);
}
$offset += self::USERS_PER_SESSION;
$this->config->setAppValue('files_trashbin', 'cronjob_user_offset', $offset);
foreach ($users as $user) {
$this->userManager->callForAllUsers(function(IUser $user) {
$uid = $user->getUID();
if (!$this->setupFS($uid)) {
continue;
return;
}
$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
Trashbin::deleteExpiredFiles($dirContent, $uid);
}
});
\OC_Util::tearDownFS();
}
@ -115,10 +92,9 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
* @param string $user
* @return boolean
*/
private function setupFS($user){
if (!$this->userManager->userExists($user)) {
return false;
}
protected function setupFS($user) {
\OC_Util::tearDownFS();
\OC_Util::setupFS($user);
// Check if this user has a trashbin directory
$view = new \OC\Files\View('/' . $user);
@ -126,9 +102,6 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
return false;
}
\OC_Util::tearDownFS();
\OC_Util::setupFS($user);
return true;
}
}

1
apps/files_trashbin/tests/backgroundjob/expiretrash.php
View file

@ -26,7 +26,6 @@ use \OCA\Files_Trashbin\BackgroundJob\ExpireTrash;
class ExpireTrash_Test extends \Test\TestCase {
public function testConstructAndRun() {
$backgroundJob = new ExpireTrash(
$this->getMock('OCP\IConfig'),
$this->getMock('OCP\IUserManager'),
$this->getMockBuilder('OCA\Files_Trashbin\Expiration')->disableOriginalConstructor()->getMock()
);

26
apps/files_versions/lib/backgroundjob/expireversions.php
View file

@ -21,6 +21,7 @@
namespace OCA\Files_Versions\BackgroundJob;
use OCP\IUser;
use OCP\IUserManager;
use OCA\Files_Versions\AppInfo\Application;
use OCA\Files_Versions\Storage;
@ -64,20 +65,13 @@ class ExpireVersions extends \OC\BackgroundJob\TimedJob {
return;
}
$users = $this->userManager->search('');
$isFSready = false;
foreach ($users as $user) {
$this->userManager->callForAllUsers(function(IUser $user) {
$uid = $user->getUID();
if (!$isFSready) {
if (!$this->setupFS($uid)) {
continue;
}
$isFSready = true;
return;
}
Storage::expireOlderThanMaxForUser($uid);
}
\OC_Util::tearDownFS();
});
}
/**
@ -85,14 +79,16 @@ class ExpireVersions extends \OC\BackgroundJob\TimedJob {
* @param string $user
* @return boolean
*/
private function setupFS($user){
if (!$this->userManager->userExists($user)) {
return false;
}
protected function setupFS($user) {
\OC_Util::tearDownFS();
\OC_Util::setupFS($user);
// Check if this user has a versions directory
$view = new \OC\Files\View('/' . $user);
if (!$view->is_dir('/files_versions')) {
return false;
}
return true;
}
}