keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We can now configure the worker runtime limits

This commit is contained in:
Michael Vogel 2022-09-24 10:00:41 +02:00
parent be9bbe1709
commit 98a4c7a56c
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Worker/Cron.php
View File

@ -77,6 +77,8 @@ class Cron
['order' => ['priority', 'retrial', 'created']]
);
$max_duration_defaults = DI::config()->get('system', 'worker_max_duration');
while ($entry = DBA::fetch($entries)) {
if (!posix_kill($entry["pid"], 0)) {
DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['id' => $entry["id"]]);
@ -84,8 +86,10 @@ class Cron
// Kill long running processes
// Define the maximum durations
$max_duration_defaults = [PRIORITY_CRITICAL => 720, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 720];
$max_duration = $max_duration_defaults[$entry['priority']];
$max_duration = $max_duration_defaults[$entry['priority']] ?? 0;
if (empty($max_duration)) {
continue;
}
$argv = json_decode($entry['parameter'], true);
if (!empty($entry['command'])) {

10
static/defaults.config.php
View File

@ -650,6 +650,16 @@ return [
// Setting 0 would allow maximum worker queues at all times, which is not recommended.
'worker_load_exponent' => 3,
// worker_max_duration (Array)
// Maximum runtime per priority. Worker processes that exceed this runtime will be terminated.
'worker_max_duration' => [
PRIORITY_CRITICAL => 720,
PRIORITY_HIGH => 10,
PRIORITY_MEDIUM => 60,
PRIORITY_LOW => 180,
PRIORITY_NEGLIGIBLE => 720
],
// worker_processes_cooldown (Integer)
// Maximum number per processes that causes a cooldown before each worker function call.
'worker_processes_cooldown' => 0,