bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

We can now configure the worker runtime limits

Browse source
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'])) {

14
static/defaults.config.php
View file

@ -552,7 +552,7 @@ return [
// runtime_loglimit (Integer)
// The runtime is logged, When the program execution time is higher than this value.
'runtime_loglimit' => 0,
// sendmail_params (Boolean)
// Normal sendmail command parameters will be added when the PHP mail() function is called for sending e-mails.
// This ensures the Sender Email address setting is applied to the message envelope rather than the host's default address.
@ -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,
@ -659,7 +669,7 @@ return [
// This is an experimental setting without knowing the performance impact.
// Does not work when "worker_fork" is enabled (Needs more testing)
'worker_multiple_fetch' => false,
// worker_defer_limit (Integer)
// Per default the systems tries delivering for 15 times before dropping it.
'worker_defer_limit' => 15,