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

Fix worker statistics

This commit is contained in:
Michael 2019-02-11 08:59:14 +00:00
parent f786e8984f
commit f65b35901e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/Worker.php
View File

@ -741,7 +741,15 @@ class Worker
$idle_workers = $active; $idle_workers = $active;
if (empty($deferred) && empty($entries)) {
$deferred = self::deferredEntries();
$entries = max(self::totalEntries() - $deferred, 0);
}
$waiting_processes = max(0, $entries - $deferred);
if (Config::get('system', 'worker_debug')) { if (Config::get('system', 'worker_debug')) {
$waiting_processes = 0;
// Now adding all processes with workerqueue entries // Now adding all processes with workerqueue entries
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
$jobs = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `next_try` < ? GROUP BY `priority`", DateTimeFormat::utcNow()); $jobs = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `next_try` < ? GROUP BY `priority`", DateTimeFormat::utcNow());
@ -754,6 +762,7 @@ class Worker
self::$db_duration_stat += (microtime(true) - $stamp); self::$db_duration_stat += (microtime(true) - $stamp);
if ($process = DBA::fetch($processes)) { if ($process = DBA::fetch($processes)) {
$idle_workers -= $process["running"]; $idle_workers -= $process["running"];
$waiting_processes += $entry["entries"];
$listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"]; $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
} }
DBA::close($processes); DBA::close($processes);
@ -775,11 +784,6 @@ class Worker
$processlist .= ' ('.implode(', ', $listitem).')'; $processlist .= ' ('.implode(', ', $listitem).')';
if (empty($deferred) && empty($entries)) {
$deferred = self::deferredEntries();
$entries = max(self::totalEntries() - $deferred, 0);
}
if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && self::entriesExists() && ($active >= $queues)) { if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && self::entriesExists() && ($active >= $queues)) {
$top_priority = self::highestPriority(); $top_priority = self::highestPriority();
$high_running = self::processWithPriorityActive($top_priority); $high_running = self::processWithPriorityActive($top_priority);
@ -790,7 +794,7 @@ class Worker
} }
} }
Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . ($entries - $deferred) . $processlist . " - maximum: " . $queues . "/" . $maxqueues, Logger::DEBUG); Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $waiting_processes . $processlist . " - maximum: " . $queues . "/" . $maxqueues, Logger::DEBUG);
// Are there fewer workers running as possible? Then fork a new one. // Are there fewer workers running as possible? Then fork a new one.
if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) { if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) {