jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Double check for maximum number of workers

Browse source
This commit is contained in:
Michael Vogel 2015-12-06 16:28:28 +01:00
parent 2dc0b2b731
commit 54085508e5
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/poller.php
View file

@ -56,12 +56,17 @@ function poller_run(&$argv, &$argc){
// But: Update processes (like the database update) mustn't be killed // But: Update processes (like the database update) mustn't be killed
} }
} else } else {
// Sleep two seconds before checking for running processes to avoid having too many workers // Checking the number of workers
if (poller_too_much_workers(1))
return;
// Sleep four seconds before checking for running processes again to avoid having too many workers
sleep(4); sleep(4);
}
// Checking number of workers // Checking number of workers
if (poller_too_much_workers()) if (poller_too_much_workers(2))
return; return;
$starttime = time(); $starttime = time();
@ -114,13 +119,13 @@ function poller_run(&$argv, &$argc){
return; return;
// Count active workers and compare them with a maximum value that depends on the load // Count active workers and compare them with a maximum value that depends on the load
if (poller_too_much_workers()) if (poller_too_much_workers(3))
return; return;
} }
} }
function poller_too_much_workers() { function poller_too_much_workers($stage) {
$queues = get_config("system", "worker_queues"); $queues = get_config("system", "worker_queues");
@ -144,7 +149,7 @@ function poller_too_much_workers() {
$slope = $maxworkers / pow($maxsysload, $exponent); $slope = $maxworkers / pow($maxsysload, $exponent);
$queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent)); $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG); logger("Current load stage ".$stage.": ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
} }