class Worker
{
private static $up_start;
- private static $db_duration;
+ private static $db_duration = 0;
+ private static $db_duration_count = 0;
+ private static $db_duration_write = 0;
+ private static $db_duration_stat = 0;
+ private static $lock_duration = 0;
private static $last_update;
- private static $lock_duration;
/**
* @brief Processes the tasks that are in the workerqueue table
{
$a = \get_app();
+ // Ensure that all "strtotime" operations do run timezone independent
+ date_default_timezone_set('UTC');
+
self::$up_start = microtime(true);
// At first check the maximum load. We shouldn't continue with a high load
$starttime = time();
+ $entries = 0;
+ $deferred = 0;
+
// We fetch the next queue entry that is about to be executed
- while ($r = self::workerProcess($passing_slow)) {
+ while ($r = self::workerProcess($passing_slow, $entries, $deferred)) {
// When we are processing jobs with a lower priority, we don't refetch new jobs
// Otherwise fast jobs could wait behind slow ones and could be blocked.
$refetched = $passing_slow;
$entries = self::totalEntries();
$deferred = self::deferredEntries();
if (Lock::acquire('worker_process', 0)) {
- $stamp = (float)microtime(true);
$refetched = self::findWorkerProcesses($passing_slow, $entries, $deferred);
- self::$db_duration += (microtime(true) - $stamp);
Lock::release('worker_process');
}
}
// To avoid the quitting of multiple workers only one worker at a time will execute the check
if (Lock::acquire('worker', 0)) {
- $stamp = (float)microtime(true);
// Count active workers and compare them with a maximum value that depends on the load
- if (self::tooMuchWorkers()) {
+ if (self::tooMuchWorkers($entries, $deferred)) {
Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
Lock::release('worker');
return;
return;
}
Lock::release('worker');
- self::$db_duration += (microtime(true) - $stamp);
}
// Quit the worker once every 5 minutes
Logger::log("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", Logger::DEBUG);
}
+ /**
+ * @brief Check if non executed tasks do exist in the worker queue
+ *
+ * @return boolean Returns "true" if tasks are existing
+ * @throws \Exception
+ */
+ private static function entriesExists()
+ {
+ $stamp = (float)microtime(true);
+ $exists = DBA::exists('workerqueue', ["NOT `done` AND `pid` = 0 AND `next_try` < ?", DateTimeFormat::utcNow()]);
+ self::$db_duration += (microtime(true) - $stamp);
+ return $exists;
+ }
+
/**
* @brief Returns the number of deferred entries in the worker queue
*
*/
private static function deferredEntries()
{
- return DBA::count('workerqueue', ["NOT `done` AND `pid` = 0 AND `next_try` > ?", DateTimeFormat::utcNow()]);
+ $stamp = (float)microtime(true);
+ $count = DBA::count('workerqueue', ["NOT `done` AND `pid` = 0 AND `next_try` > ?", DateTimeFormat::utcNow()]);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_count += (microtime(true) - $stamp);
+ return $count;
}
/**
*/
private static function totalEntries()
{
- return DBA::count('workerqueue', ['done' => false, 'pid' => 0]);
+ $stamp = (float)microtime(true);
+ $count = DBA::count('workerqueue', ['done' => false, 'pid' => 0]);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_count += (microtime(true) - $stamp);
+ return $count;
}
/**
*/
private static function highestPriority()
{
+ $stamp = (float)microtime(true);
$condition = ["`pid` = 0 AND NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()];
$workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
+ self::$db_duration += (microtime(true) - $stamp);
if (DBA::isResult($workerqueue)) {
return $workerqueue["priority"];
} else {
$stamp = (float)microtime(true);
DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
array_shift($argv);
self::execFunction($queue, $include, $argv, true);
$stamp = (float)microtime(true);
-
$condition = ["`id` = ? AND `next_try` < ?", $queue['id'], DateTimeFormat::utcNow()];
if (DBA::update('workerqueue', ['done' => true], $condition)) {
Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
}
self::$db_duration = (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
return true;
}
if (!validate_include($include)) {
Logger::log("Include file ".$argv[0]." is not valid!");
+ $stamp = (float)microtime(true);
DBA::delete('workerqueue', ['id' => $queue["id"]]);
+ self::$db_duration = (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
return true;
}
$stamp = (float)microtime(true);
DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
self::execFunction($queue, $funcname, $argv, false);
Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
}
self::$db_duration = (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
} else {
Logger::log("Function ".$funcname." does not exist");
+ $stamp = (float)microtime(true);
DBA::delete('workerqueue', ['id' => $queue["id"]]);
+ self::$db_duration = (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
return true;
$argc = count($argv);
- $new_process_id = System::processID("wrk");
+ // Currently deactivated, since the new logger doesn't support this
+ //$new_process_id = System::processID("wrk");
+ $new_process_id = '';
Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
$a->process_id = $new_process_id;
$a->queue = $queue;
- $up_duration = number_format(microtime(true) - self::$up_start, 3);
+ $up_duration = microtime(true) - self::$up_start;
// Reset global data to avoid interferences
unset($_SESSION);
$duration = (microtime(true) - $stamp);
- self::$up_start = microtime(true);
-
/* With these values we can analyze how effective the worker is.
* The database and rest time should be low since this is the unproductive time.
* The execution time is the productive time.
* By changing parameters like the maximum number of workers we can check the effectivness.
*/
Logger::log(
- 'DB: '.number_format(self::$db_duration, 2).
- ' - Lock: '.number_format(self::$lock_duration, 2).
- ' - Rest: '.number_format($up_duration - self::$db_duration - self::$lock_duration, 2).
- ' - Execution: '.number_format($duration, 2),
+ 'DB: '.number_format(self::$db_duration - (self::$db_duration_count + self::$db_duration_write + self::$db_duration_stat), 4).
+ ' - DB-Count: '.number_format(self::$db_duration_count, 4).
+ ' - DB-Stat: '.number_format(self::$db_duration_stat, 4).
+ ' - DB-Write: '.number_format(self::$db_duration_write, 4).
+ ' - Lock: '.number_format(self::$lock_duration, 4).
+ ' - Rest: '.number_format(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 4).
+ ' - Execution: '.number_format($duration, 4),
Logger::DEBUG
);
+ self::$up_start = microtime(true);
+ self::$db_duration = 0;
+ self::$db_duration_count = 0;
+ self::$db_duration_stat = 0;
+ self::$db_duration_write = 0;
self::$lock_duration = 0;
if ($duration > 3600) {
Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", Logger::DEBUG);
}
- Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds. Process PID: ".$new_process_id);
+ Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".number_format($duration, 4)." seconds. Process PID: ".$new_process_id);
// Write down the performance values into the log
if (Config::get("system", "profiler")) {
$max = $r["Value"];
}
// Or it can be granted. This overrides the system variable
+ $stamp = (float)microtime(true);
$r = DBA::p('SHOW GRANTS');
+ self::$db_duration += (microtime(true) - $stamp);
while ($grants = DBA::fetch($r)) {
$grant = array_pop($grants);
if (stristr($grant, "GRANT USAGE ON")) {
// If $max is set we will use the processlist to determine the current number of connections
// The processlist only shows entries of the current user
if ($max != 0) {
+ $stamp = (float)microtime(true);
$r = DBA::p('SHOW PROCESSLIST');
+ self::$db_duration += (microtime(true) - $stamp);
$used = DBA::numRows($r);
DBA::close($r);
*/
private static function killStaleWorkers()
{
+ $stamp = (float)microtime(true);
$entries = DBA::select(
'workerqueue',
['id', 'pid', 'executed', 'priority', 'parameter'],
['NOT `done` AND `pid` != 0'],
['order' => ['priority', 'created']]
);
+ self::$db_duration += (microtime(true) - $stamp);
while ($entry = DBA::fetch($entries)) {
if (!posix_kill($entry["pid"], 0)) {
+ $stamp = (float)microtime(true);
DBA::update(
'workerqueue',
['executed' => DBA::NULL_DATETIME, 'pid' => 0],
['id' => $entry["id"]]
);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
} else {
// Kill long running processes
// Check if the priority is in a valid range
} elseif ($entry["priority"] != PRIORITY_CRITICAL) {
$new_priority = PRIORITY_NEGLIGIBLE;
}
+ $stamp = (float)microtime(true);
DBA::update(
'workerqueue',
['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
['id' => $entry["id"]]
);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
} else {
Logger::log("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", Logger::DEBUG);
}
/**
* @brief Checks if the number of active workers exceeds the given limits
*
+ * @param integer $entries Total number of queue entries
+ * @param integer $deferred Number of deferred queue entries
+ *
* @return bool Are there too much workers running?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function tooMuchWorkers()
+ public static function tooMuchWorkers($entries = 0, $deferred = 0)
{
$queues = Config::get("system", "worker_queues", 4);
$processlist = '';
if (Config::get('system', 'worker_jpm')) {
- $intervals = [1, 10, 60];
+ $intervals = explode(',', Config::get('system', 'worker_jpm_range'));
$jobs_per_minute = [];
foreach ($intervals as $interval) {
+ if ($interval == 0) {
+ continue;
+ } else {
+ $interval = (int)$interval;
+ }
+
+ $stamp = (float)microtime(true);
$jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ? MINUTE", $interval);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_stat += (microtime(true) - $stamp);
if ($job = DBA::fetch($jobs)) {
$jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0);
}
$processlist = ' - jpm: '.implode('/', $jobs_per_minute);
}
- if (Config::get('system', 'worker_debug')) {
- // Create a list of queue entries grouped by their priority
- $listitem = [0 => ''];
+ // Create a list of queue entries grouped by their priority
+ $listitem = [0 => ''];
+
+ $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')) {
+ $waiting_processes = 0;
// Now adding all processes with workerqueue entries
- $entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`");
- while ($entry = DBA::fetch($entries)) {
+ $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());
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_stat += (microtime(true) - $stamp);
+ while ($entry = DBA::fetch($jobs)) {
+ $stamp = (float)microtime(true);
$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE NOT `done` AND `priority` = ?", $entry["priority"]);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_stat += (microtime(true) - $stamp);
if ($process = DBA::fetch($processes)) {
$idle_workers -= $process["running"];
+ $waiting_processes += $entry["entries"];
$listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
}
DBA::close($processes);
}
- DBA::close($entries);
-
- $listitem[0] = "0:" . max(0, $idle_workers);
+ DBA::close($jobs);
+ } else {
+ $stamp = (float)microtime(true);
+ $jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` GROUP BY `priority` ORDER BY `priority`");
+ self::$db_duration += (microtime(true) - $stamp);
- $processlist .= ' ('.implode(', ', $listitem).')';
+ while ($entry = DBA::fetch($jobs)) {
+ $idle_workers -= $entry["running"];
+ $listitem[$entry["priority"]] = $entry["priority"].":".$entry["running"];
+ }
+ DBA::close($jobs);
}
- $deferred = self::deferredEntries();
- $entries = max(self::totalEntries() - $deferred, 0);
+ $listitem[0] = "0:" . max(0, $idle_workers);
+
+ $processlist .= ' ('.implode(', ', $listitem).')';
- if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($entries > 0) && ($active >= $queues)) {
+ if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && self::entriesExists() && ($active >= $queues)) {
$top_priority = self::highestPriority();
$high_running = self::processWithPriorityActive($top_priority);
}
}
- Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $entries . $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.
if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) {
*/
private static function activeWorkers()
{
- return DBA::count('process', ['command' => 'Worker.php']);
+ $stamp = (float)microtime(true);
+ $count = DBA::count('process', ['command' => 'Worker.php']);
+ self::$db_duration += (microtime(true) - $stamp);
+ return $count;
}
/**
{
$highest_priority = 0;
+ $stamp = (float)microtime(true);
$r = DBA::p(
"SELECT `priority`
FROM `process`
INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done`"
);
+ self::$db_duration += (microtime(true) - $stamp);
// No active processes at all? Fine
if (!DBA::isResult($r)) {
$ids = [];
if (self::passingSlow($highest_priority)) {
// Are there waiting processes with a higher priority than the currently highest?
+ $stamp = (float)microtime(true);
$result = DBA::select(
'workerqueue',
['id'],
["`pid` = 0 AND `priority` < ? AND NOT `done` AND `next_try` < ?",
$highest_priority, DateTimeFormat::utcNow()],
- ['limit' => $limit, 'order' => ['priority', 'created']]
+ ['limit' => 1, 'order' => ['priority', 'created']]
);
+ self::$db_duration += (microtime(true) - $stamp);
while ($id = DBA::fetch($result)) {
$ids[] = $id["id"];
if (!$found) {
// Give slower processes some processing time
+ $stamp = (float)microtime(true);
$result = DBA::select(
'workerqueue',
['id'],
["`pid` = 0 AND `priority` > ? AND NOT `done` AND `next_try` < ?",
$highest_priority, DateTimeFormat::utcNow()],
- ['limit' => $limit, 'order' => ['priority', 'created']]
+ ['limit' => 1, 'order' => ['priority', 'created']]
);
+ self::$db_duration += (microtime(true) - $stamp);
while ($id = DBA::fetch($result)) {
$ids[] = $id["id"];
}
}
+ // At first try to fetch a bunch of high or medium tasks
+ if (!$found && ($limit > 1)) {
+ $stamp = (float)microtime(true);
+ $result = DBA::select(
+ 'workerqueue',
+ ['id'],
+ ["`pid` = 0 AND NOT `done` AND `priority` <= ? AND `next_try` < ? AND `retrial` = 0",
+ PRIORITY_MEDIUM, DateTimeFormat::utcNow()],
+ ['limit' => $limit, 'order' => ['created']]
+ );
+ self::$db_duration += (microtime(true) - $stamp);
+
+ while ($id = DBA::fetch($result)) {
+ $ids[] = $id["id"];
+ }
+ DBA::close($result);
+
+ $found = (count($ids) > 0);
+ }
+
// If there is no result (or we shouldn't pass lower processes) we check without priority limit
if (!$found) {
+ $stamp = (float)microtime(true);
$result = DBA::select(
'workerqueue',
['id'],
["`pid` = 0 AND NOT `done` AND `next_try` < ?",
DateTimeFormat::utcNow()],
- ['limit' => $limit, 'order' => ['priority', 'created']]
+ ['limit' => 1, 'order' => ['priority', 'created']]
);
+ self::$db_duration += (microtime(true) - $stamp);
while ($id = DBA::fetch($result)) {
$ids[] = $id["id"];
}
if ($found) {
+ $stamp = (float)microtime(true);
$condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
array_unshift($ids, $condition);
DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $ids);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
return $found;
* @brief Returns the next worker process
*
* @param boolean $passing_slow Returns if we had passed low priority processes
+ * @param integer $entries Returns total number of queue entries
+ * @param integer $deferred Returns number of deferred queue entries
+ *
* @return string SQL statement
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function workerProcess(&$passing_slow)
+ public static function workerProcess(&$passing_slow, &$entries, &$deferred)
{
- $stamp = (float)microtime(true);
-
// There can already be jobs for us in the queue.
+ $stamp = (float)microtime(true);
$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
+ self::$db_duration += (microtime(true) - $stamp);
if (DBA::isResult($r)) {
- self::$db_duration += (microtime(true) - $stamp);
return DBA::toArray($r);
}
DBA::close($r);
- $stamp = (float)microtime(true);
-
// Counting the rows outside the lock reduces the lock time
$entries = self::totalEntries();
$deferred = self::deferredEntries();
+ $stamp = (float)microtime(true);
if (!Lock::acquire('worker_process')) {
return false;
}
- self::$lock_duration = (microtime(true) - $stamp);
+ self::$lock_duration += (microtime(true) - $stamp);
- $stamp = (float)microtime(true);
$found = self::findWorkerProcesses($passing_slow, $entries, $deferred);
- self::$db_duration += (microtime(true) - $stamp);
Lock::release('worker_process');
if ($found) {
+ $stamp = (float)microtime(true);
$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
+ self::$db_duration += (microtime(true) - $stamp);
return DBA::toArray($r);
}
return false;
{
$mypid = getmypid();
+ $stamp = (float)microtime(true);
DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
/**
$timeout = Config::get("system", "frontend_worker_timeout", 10);
/// @todo We should clean up the corresponding workerqueue entries as well
+ $stamp = (float)microtime(true);
$condition = ["`created` < ? AND `command` = 'worker.php'",
DateTimeFormat::utc("now - ".$timeout." minutes")];
DBA::delete('process', $condition);
+ self::$db_duration = (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
/**
Logger::log('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next . ' - priority old/new: ' . $queue['priority'] . '/' . $priority, Logger::DEBUG);
+ $stamp = (float)microtime(true);
$fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => DBA::NULL_DATETIME, 'pid' => 0, 'priority' => $priority];
DBA::update('workerqueue', $fields, ['id' => $id]);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
/**
*/
public static function IPCSetJobState($jobs)
{
+ $stamp = (float)microtime(true);
DBA::update('worker-ipc', ['jobs' => $jobs], ['key' => 1], true);
+ self::$db_duration += (microtime(true) - $stamp);
+ self::$db_duration_write += (microtime(true) - $stamp);
}
/**
*/
public static function IPCJobsExists()
{
+ $stamp = (float)microtime(true);
$row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => 1]);
+ self::$db_duration += (microtime(true) - $stamp);
// When we don't have a row, no job is running
if (!DBA::isResult($row)) {
projects / friendica.git / blobdiff