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

Some more information about the current queue status of the worker

Browse source
This commit is contained in:
Michael Vogel 2016-07-22 18:07:04 +02:00
parent 4c5fb5947d
commit fb447e84ee
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/poller.php
View file

@ -39,7 +39,7 @@ function poller_run(&$argv, &$argc){
return; return;
// Checking the number of workers // Checking the number of workers
if (poller_too_much_workers(1)) { if (poller_too_much_workers()) {
poller_kill_stale_workers(); poller_kill_stale_workers();
return; return;
} }
@ -58,7 +58,7 @@ function poller_run(&$argv, &$argc){
sleep(4); sleep(4);
// Checking number of workers // Checking number of workers
if (poller_too_much_workers(2)) if (poller_too_much_workers())
return; return;
$cooldown = Config::get("system", "worker_cooldown", 0); $cooldown = Config::get("system", "worker_cooldown", 0);
@ -76,7 +76,7 @@ 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(3)) if (poller_too_much_workers())
return; return;
q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'", q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
@ -244,7 +244,7 @@ function poller_kill_stale_workers() {
} }
} }
function poller_too_much_workers($stage) { function poller_too_much_workers() {
$queues = get_config("system", "worker_queues"); $queues = get_config("system", "worker_queues");
@ -267,7 +267,9 @@ function poller_too_much_workers($stage) {
$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 stage ".$stage.": ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG); $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'");
logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$s[0]["total"]." - maximum: ".$queues, LOGGER_DEBUG);
} }