From aa6ed02587df06d6fc9ff3534a8f0622d7bde47e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 17 Nov 2021 15:04:51 +0100 Subject: stop background scan early if a users still has unscanned files after background scan Signed-off-by: Robin Appelman --- apps/files/lib/BackgroundJob/ScanFiles.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'apps/files') diff --git a/apps/files/lib/BackgroundJob/ScanFiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php index 37416aed521..250338e1262 100644 --- a/apps/files/lib/BackgroundJob/ScanFiles.php +++ b/apps/files/lib/BackgroundJob/ScanFiles.php @@ -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"); + } } } -- cgit v1.2.3