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

Merge pull request #5251 from miqrogroove/patch-1 

Unify Worker Load Formulas
This commit is contained in:
Hypolite Petovan 2018-06-20 08:55:19 -04:00 committed by GitHub
parent 3eca4bdb57 f7e197c26e
commit 1e00efdb99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/htconfig.md
View File

@ -94,7 +94,7 @@ Example: To set the automatic database cleanup process add this line to your .ht
* **throttle_limit_month** - Maximum number of posts that a user can send per month with the API. * **throttle_limit_month** - Maximum number of posts that a user can send per month with the API.
* **wall-to-wall_share** (Boolean) - Displays forwarded posts like "wall-to-wall" posts. * **wall-to-wall_share** (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
* **worker_cooldown** - Cooldown time after each worker function call. Default value is 0 seconds. * **worker_cooldown** - Cooldown time after each worker function call. Default value is 0 seconds.
* **worker_linear_load** (Boolean) - Enables the linear calculation of maximum queues. * **worker_load_exponent** (Integer) - Default 3, which allows only 25% of the maximum worker queues when server load reaches around 37% of maximum load. For a linear response where 25% of worker queues are allowed at 75% of maximum load, set this to 1. Setting 0 would allow maximum worker queues at all times, which is not recommended.
* **xrd_timeout** - Timeout for fetching the XRD links. Default value is 20 seconds. * **xrd_timeout** - Timeout for fetching the XRD links. Default value is 20 seconds.
## experimental ## ## experimental ##

36
src/Core/Worker.php
View File

@ -625,34 +625,14 @@ class Worker
if ($load) { if ($load) {
$maxsysload = intval(Config::get("system", "maxloadavg", 50)); $maxsysload = intval(Config::get("system", "maxloadavg", 50));
if (Config::get('system', 'worker_linear_load', false)) { /* Default exponent 3 causes queues to rapidly decrease as load increases.
/* The linear load calculation works fine if there is a low * If you have 20 max queues at idle, then you get only 5 queues at 37.1% of $maxsysload.
* number of maximum queues and a high load base level. * For some environments, this rapid decrease is not needed.
* This can be present at shared hosters. * With exponent 1, you could have 20 max queues at idle and 13 at 37% of $maxsysload.
*/ */
$tinyload = 1; $exponent = intval(Config::get('system', 'worker_load_exponent', 3));
$slope = pow(max(0, $maxsysload - $load) / $maxsysload, $exponent);
if ($load > $maxsysload) { $queues = intval(ceil($slope * $maxqueues));
$queues = 0;
} elseif ($load > $tinyload) {
//Provide $queues number between 1 (below max load) and $maxqueues - 1 (above tiny load).
$range = $maxsysload - $tinyload;
$slope = 1.00 - (($load - $tinyload) / $range);
$target = $slope * ($maxqueues - 1);
$queues = intval(ceil($target));
}
} else {
/* The exponentional load calculation respects the load behaviour
* of Linux systems with regular hardware that normally idles
* with load values near 0.
*/
$maxworkers = $queues;
// Some magical mathemathics to reduce the workers
$exponent = 3;
$slope = $maxworkers / pow($maxsysload, $exponent);
$queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
}
$processlist = ''; $processlist = '';