Unify Worker Load Formulas
This commit is contained in:
parent
3eca4bdb57
commit
97cabcecf2
|
@ -626,34 +626,14 @@ class Worker
|
||||||
$maxsysload = intval(Config::get("system", "maxloadavg", 50));
|
$maxsysload = intval(Config::get("system", "maxloadavg", 50));
|
||||||
|
|
||||||
if (Config::get('system', 'worker_linear_load', false)) {
|
if (Config::get('system', 'worker_linear_load', false)) {
|
||||||
/* The linear load calculation works fine if there is a low
|
$exponent = 1;
|
||||||
* number of maximum queues and a high load base level.
|
|
||||||
* This can be present at shared hosters.
|
|
||||||
*/
|
|
||||||
$tinyload = 1;
|
|
||||||
|
|
||||||
if ($load > $maxsysload) {
|
|
||||||
$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 {
|
} 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;
|
$exponent = 3;
|
||||||
$slope = $maxworkers / pow($maxsysload, $exponent);
|
|
||||||
$queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$slope = pow(max(0, $maxsysload - $load) / $maxsysload, $exponent);
|
||||||
|
$queues = intval(ceil($slope * $maxqueues));
|
||||||
|
|
||||||
$processlist = '';
|
$processlist = '';
|
||||||
|
|
||||||
if (Config::get('system', 'worker_debug')) {
|
if (Config::get('system', 'worker_debug')) {
|
||||||
|
|
Loading…
Reference in a new issue