strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2685 from annando/1607-poller-information

Browse source 
Some more logging information for the poller
This commit is contained in:
fabrixxm 2016-07-25 08:53:50 +02:00 committed by GitHub
commit 18cbe9f6ff
2 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
boot.php
View file

@ -1786,12 +1786,27 @@ function proc_run($cmd){
$found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'", $found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
dbesc($parameters)); dbesc($parameters));
$funcname = str_replace(".php", "", basename($argv[0]))."_run";
// Define the processes that have priority over any other process
/// @todo Better check for priority processes
$high_priority = array("delivery_run", "notifier_run", "pubsubpublish_run");
$low_priority = array("queue_run", "gprobe_run", "discover_poco_run");
if (in_array($funcname, $high_priority))
$priority = 1;
elseif (in_array($funcname, $low_priority))
$priority = 3;
else
$priority = 2;
if (!$found) if (!$found)
q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`) q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`)
VALUES ('%s', '%s', %d)", VALUES ('%s', '%s', '%s', %d)",
dbesc($funcname),
dbesc($parameters), dbesc($parameters),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval(0)); intval($priority));
// Should we quit and wait for the poller to be called as a cronjob? // Should we quit and wait for the poller to be called as a cronjob?
if (get_config("system", "worker_dont_fork")) if (get_config("system", "worker_dont_fork"))

26
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,14 +58,14 @@ 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);
$starttime = time(); $starttime = time();
while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) { while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority`, `created` LIMIT 1")) {
// Constantly check the number of parallel database processes // Constantly check the number of parallel database processes
if ($a->max_processes_reached()) if ($a->max_processes_reached())
@ -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'",
@ -108,18 +108,18 @@ function poller_run(&$argv, &$argc){
require_once($include); require_once($include);
$funcname=str_replace(".php", "", basename($argv[0]))."_run"; $funcname = str_replace(".php", "", basename($argv[0]))."_run";
if (function_exists($funcname)) { if (function_exists($funcname)) {
logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]); logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
$funcname($argv, $argc); $funcname($argv, $argc);
if ($cooldown > 0) { if ($cooldown > 0) {
logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds"); logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
sleep($cooldown); sleep($cooldown);
} }
logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." - done"); logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"])); q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
} else } else
@ -244,13 +244,16 @@ 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");
if ($queues == 0) if ($queues == 0)
$queues = 4; $queues = 4;
$maxqueues = $queues;
$active = poller_active_workers(); $active = poller_active_workers();
// Decrease the number of workers at higher load // Decrease the number of workers at higher load
@ -267,7 +270,10 @@ 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'");
$entries = $s[0]["total"];
logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$entries." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
} }