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

Chunk the users correctly in the trashbin and versions background job

1 files changed, 12 insertions, 16 deletions

diff --git a/apps/files_versions/lib/backgroundjob/expireversions.php b/apps/files_versions/lib/backgroundjob/expireversions.php
index 5d8eef4e351..8e14e65b9a7 100644
--- a/apps/files_versions/lib/backgroundjob/expireversions.php
+++ b/apps/files_versions/lib/backgroundjob/expireversions.php
@@ -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;
+			if (!$this->setupFS($uid)) {
+				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;
 	}
 }