petru/nextcloud-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cron): Warn on excessive memory consumption in background jobs

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling
2023-12-20 10:58:08 +01:00
parent 66b2fd95d1
commit 28b55bba55
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cron.php
+14
View File
@@ -149,8 +149,22 @@ try {
}
$logger->debug('CLI cron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']);
$memoryBefore = memory_get_usage();
$memoryPeakBefore = memory_get_peak_usage();
$job->execute($jobList, $logger);
$memoryAfter = memory_get_usage();
$memoryPeakAfter = memory_get_peak_usage();
if ($memoryAfter - $memoryBefore > 10_000_000) {
$logger->warning('Used memory grew by more than 10 MB when executing job ' . get_class($job) . ' : ' . \OCP\Util::humanFileSize($memoryAfter). ' (before: ' . \OCP\Util::humanFileSize($memoryBefore) . ')', ['app' => 'cron']);
}
if ($memoryPeakAfter > 300_000_000) {
$logger->warning('Cron job used more than 300 MB of ram after executing job ' . get_class($job) . ': ' . \OCP\Util::humanFileSize($memoryPeakAfter) . ' (before: ' . \OCP\Util::humanFileSize($memoryPeakBefore) . ')', ['app' => 'cron']);
}
// clean up after unclean jobs
\OC_Util::tearDownFS();
$tempManager->clean();