sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stop background scan early if a users still has unscanned files after background scan 

Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/30056/head
Robin Appelman 2021-11-17 15:04:51 +07:00 committed by Louis (Rebase PR Action)
parent 70f23a4285
commit ac28e0aefd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files/lib/BackgroundJob/ScanFiles.php
Unescape Escape View File

@ -116,11 +116,17 @@ class ScanFiles extends \OC\BackgroundJob\TimedJob {
}
$usersScanned = 0;
$lastUser = '';
$user = $this->getUserToScan();
while ($user && $usersScanned < self::USERS_PER_SESSION) {
while ($user && $usersScanned < self::USERS_PER_SESSION && $lastUser !== $user) {
$this->runScanner($user);
$lastUser = $user;
$user = $this->getUserToScan();
$usersScanned += 1;
}
if ($lastUser === $user) {
$this->logger->warning("User $user still has unscanned files after running background scan, background scan might be stopped prematurely");
}
}
}