namespace Friendica\Core;
use Friendica\BaseObject;
+use Friendica\Core;
use Friendica\Database\DBA;
use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
*/
class Worker
{
+ const STATE_STARTUP = 1; // Worker is in startup. This takes most time.
+ const STATE_LONG_LOOP = 2; // Worker is processing the whole - long - loop.
+ const STATE_REFETCH = 3; // Worker had refetched jobs in the execution loop.
+ const STATE_SHORT_LOOP = 4; // Worker is processing preassigned jobs, thus saving much time.
+
+ const FAST_COMMANDS = ['APDelivery', 'Delivery', 'CreateShadowEntry'];
+
+
private static $up_start;
private static $db_duration = 0;
private static $db_duration_count = 0;
private static $db_duration_stat = 0;
private static $lock_duration = 0;
private static $last_update;
+ private static $state;
/**
* @brief Processes the tasks that are in the workerqueue table
}
$starttime = time();
-
- $entries = 0;
- $deferred = 0;
+ self::$state = self::STATE_STARTUP;
// We fetch the next queue entry that is about to be executed
- 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;
-
+ while ($r = self::workerProcess()) {
+ $refetched = false;
foreach ($r as $entry) {
// Assure that the priority is an integer value
$entry['priority'] = (int)$entry['priority'];
return;
}
- // If possible we will fetch new jobs for this worker
- if (!$refetched) {
- $entries = self::totalEntries();
- $deferred = self::deferredEntries();
- if (Lock::acquire('worker_process', 0)) {
- $refetched = self::findWorkerProcesses($passing_slow, $entries, $deferred);
- Lock::release('worker_process');
- }
+ // Trying to fetch new processes - but only once when successful
+ if (!$refetched && Lock::acquire('worker_process', 0)) {
+ self::findWorkerProcesses();
+ Lock::release('worker_process');
+ self::$state = self::STATE_REFETCH;
+ $refetched = true;
+ } else {
+ self::$state = self::STATE_SHORT_LOOP;
}
}
// To avoid the quitting of multiple workers only one worker at a time will execute the check
- if (Lock::acquire('worker', 0)) {
+ if (!self::getWaitingJobForPID()) {
+ self::$state = self::STATE_LONG_LOOP;
+
+ if (Lock::acquire('worker', 0)) {
// Count active workers and compare them with a maximum value that depends on the load
- if (self::tooMuchWorkers($entries, $deferred)) {
- Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
- Lock::release('worker');
- return;
- }
+ if (self::tooMuchWorkers()) {
+ Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
+ Lock::release('worker');
+ return;
+ }
- // Check free memory
- if ($a->isMinMemoryReached()) {
- Logger::log('Memory limit reached, quitting.', Logger::DEBUG);
+ // Check free memory
+ if ($a->isMinMemoryReached()) {
+ Logger::log('Memory limit reached, quitting.', Logger::DEBUG);
+ Lock::release('worker');
+ return;
+ }
Lock::release('worker');
- return;
}
- Lock::release('worker');
}
- // Quit the worker once every 5 minutes
- if (time() > ($starttime + 300)) {
- Logger::log('Process lifetime reached, quitting.', Logger::DEBUG);
+ // Quit the worker once every cron interval
+ if (time() > ($starttime + (Config::get('system', 'cron_interval') * 60))) {
+ Logger::info('Process lifetime reached, respawning.');
+ self::spawnWorker();
return;
}
}
private static function deferredEntries()
{
$stamp = (float)microtime(true);
- $count = DBA::count('workerqueue', ["NOT `done` AND `pid` = 0 AND `next_try` > ?", DateTimeFormat::utcNow()]);
+ $count = DBA::count('workerqueue', ["NOT `done` AND `pid` = 0 AND `retrial` > ?", 0]);
self::$db_duration += (microtime(true) - $stamp);
self::$db_duration_count += (microtime(true) - $stamp);
return $count;
{
$a = \get_app();
- $mypid = getmypid();
-
$argc = count($argv);
- $new_process_id = System::processID("wrk");
+ Logger::enableWorker($funcname);
- Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
+ Logger::info("Process start.", ['priority' => $queue["priority"], 'id' => $queue["id"]]);
$stamp = (float)microtime(true);
// We use the callstack here to analyze the performance of executed worker entries.
// For this reason the variables have to be initialized.
- if (Config::get("system", "profiler")) {
- $a->performance["start"] = microtime(true);
- $a->performance["database"] = 0;
- $a->performance["database_write"] = 0;
- $a->performance["cache"] = 0;
- $a->performance["cache_write"] = 0;
- $a->performance["network"] = 0;
- $a->performance["file"] = 0;
- $a->performance["rendering"] = 0;
- $a->performance["parser"] = 0;
- $a->performance["marktime"] = 0;
- $a->performance["markstart"] = microtime(true);
- $a->callstack = [];
- }
-
- // For better logging create a new process id for every worker call
- // But preserve the old one for the worker
- $old_process_id = $a->process_id;
- $a->process_id = $new_process_id;
+ $a->getProfiler()->reset();
+
$a->queue = $queue;
$up_duration = microtime(true) - self::$up_start;
// Reset global data to avoid interferences
unset($_SESSION);
+ // Set the workerLogger as new default logger
if ($method_call) {
call_user_func_array(sprintf('Friendica\Worker\%s::execute', $funcname), $argv);
} else {
$funcname($argv, $argc);
}
- $a->process_id = $old_process_id;
+ Logger::disableWorker();
+
unset($a->queue);
$duration = (microtime(true) - $stamp);
* 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 - (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
- );
+ $dbtotal = round(self::$db_duration, 2);
+ $dbread = round(self::$db_duration - (self::$db_duration_count + self::$db_duration_write + self::$db_duration_stat), 2);
+ $dbcount = round(self::$db_duration_count, 2);
+ $dbstat = round(self::$db_duration_stat, 2);
+ $dbwrite = round(self::$db_duration_write, 2);
+ $dblock = round(self::$lock_duration, 2);
+ $rest = round(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 2);
+ $exec = round($duration, 2);
+
+ Logger::info('Performance:', ['state' => self::$state, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'lock' => $dblock, 'total' => $dbtotal, 'rest' => $rest, 'exec' => $exec]);
self::$up_start = microtime(true);
self::$db_duration = 0;
self::$lock_duration = 0;
if ($duration > 3600) {
- Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", Logger::DEBUG);
+ Logger::info('Longer than 1 hour.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]);
} elseif ($duration > 600) {
- Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", Logger::DEBUG);
+ Logger::info('Longer than 10 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]);
} elseif ($duration > 300) {
- Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", Logger::DEBUG);
+ Logger::info('Longer than 5 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]);
} elseif ($duration > 120) {
- Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", Logger::DEBUG);
+ Logger::info('Longer than 2 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]);
}
- Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds. Process PID: ".$new_process_id);
-
- // Write down the performance values into the log
- if (Config::get("system", "profiler")) {
- $duration = microtime(true)-$a->performance["start"];
+ Logger::info('Process done.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration, 3)]);
- $o = '';
- if (Config::get("rendertime", "callstack")) {
- if (isset($a->callstack["database"])) {
- $o .= "\nDatabase Read:\n";
- foreach ($a->callstack["database"] as $func => $time) {
- $time = round($time, 3);
- if ($time > 0) {
- $o .= $func.": ".$time."\n";
- }
- }
- }
- if (isset($a->callstack["database_write"])) {
- $o .= "\nDatabase Write:\n";
- foreach ($a->callstack["database_write"] as $func => $time) {
- $time = round($time, 3);
- if ($time > 0) {
- $o .= $func.": ".$time."\n";
- }
- }
- }
- if (isset($a->callstack["dache"])) {
- $o .= "\nCache Read:\n";
- foreach ($a->callstack["dache"] as $func => $time) {
- $time = round($time, 3);
- if ($time > 0) {
- $o .= $func.": ".$time."\n";
- }
- }
- }
- if (isset($a->callstack["dache_write"])) {
- $o .= "\nCache Write:\n";
- foreach ($a->callstack["dache_write"] as $func => $time) {
- $time = round($time, 3);
- if ($time > 0) {
- $o .= $func.": ".$time."\n";
- }
- }
- }
- if (isset($a->callstack["network"])) {
- $o .= "\nNetwork:\n";
- foreach ($a->callstack["network"] as $func => $time) {
- $time = round($time, 3);
- if ($time > 0) {
- $o .= $func.": ".$time."\n";
- }
- }
- }
- }
-
- Logger::log(
- "ID ".$queue["id"].": ".$funcname.": ".sprintf(
- "DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
- number_format($a->performance["database"] - $a->performance["database_write"], 2),
- number_format($a->performance["database_write"], 2),
- number_format($a->performance["cache"], 2),
- number_format($a->performance["cache_write"], 2),
- number_format($a->performance["network"], 2),
- number_format($a->performance["file"], 2),
- number_format($duration - ($a->performance["database"]
- + $a->performance["cache"] + $a->performance["cache_write"]
- + $a->performance["network"] + $a->performance["file"]), 2),
- number_format($duration, 2)
- ),
- Logger::DEBUG
- );
- }
+ $a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname);
$cooldown = Config::get("system", "worker_cooldown", 0);
if ($cooldown > 0) {
- Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+ Logger::info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]);
sleep($cooldown);
}
}
/**
* @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($entries = 0, $deferred = 0)
+ private static function tooMuchWorkers()
{
- $queues = Config::get("system", "worker_queues", 4);
+ $queues = Config::get("system", "worker_queues", 10);
$maxqueues = $queues;
// Decrease the number of workers at higher load
$load = System::currentLoad();
if ($load) {
- $maxsysload = intval(Config::get("system", "maxloadavg", 50));
+ $maxsysload = intval(Config::get("system", "maxloadavg", 20));
/* Default exponent 3 causes queues to rapidly decrease as load increases.
* If you have 20 max queues at idle, then you get only 5 queues at 37.1% of $maxsysload.
$idle_workers = $active;
- if (empty($deferred) && empty($entries)) {
- $deferred = self::deferredEntries();
- $entries = max(self::totalEntries() - $deferred, 0);
- }
-
- $waiting_processes = max(0, $entries - $deferred);
+ $deferred = self::deferredEntries();
if (Config::get('system', 'worker_debug')) {
$waiting_processes = 0;
}
DBA::close($jobs);
} else {
+ $waiting_processes = self::totalEntries();
$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);
+ self::$db_duration_stat += (microtime(true) - $stamp);
while ($entry = DBA::fetch($jobs)) {
$idle_workers -= $entry["running"];
$processlist .= ' ('.implode(', ', $listitem).')';
- if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && self::entriesExists() && ($active >= $queues)) {
+ if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($active >= $queues) && self::entriesExists()) {
$top_priority = self::highestPriority();
$high_running = self::processWithPriorityActive($top_priority);
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)) {
+ if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && self::entriesExists()) {
Logger::log("Active workers: ".$active."/".$queues." Fork a new worker.", Logger::DEBUG);
if (Config::get('system', 'worker_daemon_mode', false)) {
self::IPCSetJobState(true);
}
/**
- * @brief Check if we should pass some slow processes
+ * @brief Returns waiting jobs for the current process id
*
- * When the active processes of the highest priority are using more than 2/3
- * of all processes, we let pass slower processes.
+ * @return array waiting workerqueue jobs
+ * @throws \Exception
+ */
+ private static function getWaitingJobForPID()
+ {
+ $stamp = (float)microtime(true);
+ $r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
+ self::$db_duration += (microtime(true) - $stamp);
+ if (DBA::isResult($r)) {
+ return DBA::toArray($r);
+ }
+ DBA::close($r);
+
+ return false;
+ }
+
+ /**
+ * @brief Returns the next jobs that should be executed
*
- * @param string $highest_priority Returns the currently highest priority
- * @return bool We let pass a slower process than $highest_priority
+ * @return array array with next jobs
* @throws \Exception
*/
- private static function passingSlow(&$highest_priority)
+ private static function nextProcess()
{
- $highest_priority = 0;
+ $priority = self::nextPriority();
+ if (empty($priority)) {
+ Logger::info('No tasks found');
+ return [];
+ }
+
+ $limit = Config::get('system', 'worker_fetch_limit', 1);
+ $ids = [];
$stamp = (float)microtime(true);
- $r = DBA::p(
- "SELECT `priority`
- FROM `process`
- INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done`"
- );
+ $condition = ["`priority` = ? AND `pid` = 0 AND NOT `done` AND `next_try` < ?", $priority, DateTimeFormat::utcNow()];
+ $tasks = DBA::select('workerqueue', ['id', 'parameter'], $condition, ['limit' => $limit, 'order' => ['created']]);
self::$db_duration += (microtime(true) - $stamp);
-
- // No active processes at all? Fine
- if (!DBA::isResult($r)) {
- return false;
+ while ($task = DBA::fetch($tasks)) {
+ $ids[] = $task['id'];
+ // Only continue that loop while we are storing commands that can be processed quickly
+ $command = json_decode($task['parameter'])[0];
+ if (!in_array($command, self::FAST_COMMANDS)) {
+ break;
+ }
}
- $priorities = [];
- while ($line = DBA::fetch($r)) {
- $priorities[] = $line["priority"];
+ DBA::close($tasks);
+
+ Logger::info('Found:', ['priority' => $priority, 'id' => $ids]);
+ return $ids;
+ }
+
+ /**
+ * @brief Returns the priority of the next workerqueue job
+ *
+ * @return string priority
+ * @throws \Exception
+ */
+ private static function nextPriority()
+ {
+ $waiting = [];
+ $priorities = [PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE];
+ foreach ($priorities as $priority) {
+ $stamp = (float)microtime(true);
+ if (DBA::exists('workerqueue', ["`priority` = ? AND `pid` = 0 AND NOT `done` AND `next_try` < ?", $priority, DateTimeFormat::utcNow()])) {
+ $waiting[$priority] = true;
+ }
+ self::$db_duration += (microtime(true) - $stamp);
}
- DBA::close($r);
- // Should not happen
- if (count($priorities) == 0) {
- return false;
+ if (!empty($waiting[PRIORITY_CRITICAL])) {
+ return PRIORITY_CRITICAL;
}
- $highest_priority = min($priorities);
- // The highest process is already the slowest one?
- // Then we quit
- if ($highest_priority == PRIORITY_NEGLIGIBLE) {
- return false;
+ $running = [];
+ $running_total = 0;
+ $stamp = (float)microtime(true);
+ $processes = DBA::p("SELECT COUNT(DISTINCT(`process`.`pid`)) AS `running`, `priority` FROM `process`
+ INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
+ WHERE NOT `done` GROUP BY `priority`");
+ self::$db_duration += (microtime(true) - $stamp);
+ while ($process = DBA::fetch($processes)) {
+ $running[$process['priority']] = $process['running'];
+ $running_total += $process['running'];
}
- $high = 0;
+ DBA::close($processes);
+
foreach ($priorities as $priority) {
- if ($priority == $highest_priority) {
- ++$high;
+ if (!empty($waiting[$priority]) && empty($running[$priority])) {
+ Logger::info('No running worker found with priority {priority} - assigning it.', ['priority' => $priority]);
+ return $priority;
+ }
+ }
+
+ $active = max(self::activeWorkers(), $running_total);
+ $priorities = max(count($waiting), count($running));
+ $exponent = 2;
+
+ $total = 0;
+ for ($i = 1; $i <= $priorities; ++$i) {
+ $total += pow($i, $exponent);
+ }
+
+ $limit = [];
+ for ($i = 1; $i <= $priorities; ++$i) {
+ $limit[$priorities - $i] = max(1, round($active * (pow($i, $exponent) / $total)));
+ }
+
+ $i = 0;
+ foreach ($running as $priority => $workers) {
+ if ($workers < $limit[$i++]) {
+ Logger::info('Priority {priority} has got {workers} workers out of a limit of {limit}', ['priority' => $priority, 'workers' => $workers, 'limit' => $limit[$i - 1]]);
+ return $priority;
}
}
- Logger::log("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, Logger::DEBUG);
- $passing_slow = (($high/count($priorities)) > (2/3));
- if ($passing_slow) {
- Logger::log("Passing slower processes than priority ".$highest_priority, Logger::DEBUG);
+ if (!empty($waiting)) {
+ $priority = array_keys($waiting)[0];
+ Logger::info('No underassigned priority found, now taking the highest priority.', ['priority' => $priority]);
+ return $priority;
}
- return $passing_slow;
+
+ return false;
}
/**
* @brief Find and claim the next worker process for us
*
- * @param boolean $passing_slow Returns if we had passed low priority processes
- * @param integer $entries Total number of queue entries
- * @param integer $deferred Number of deferred queue entries
* @return boolean Have we found something?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function findWorkerProcesses(&$passing_slow, $entries, $deferred)
+ private static function findWorkerProcesses()
{
$mypid = getmypid();
- // Check if we should pass some low priority process
- $highest_priority = 0;
- $found = false;
- $passing_slow = false;
-
- // The higher the number of parallel workers, the more we prefetch to prevent concurring access
- // We decrease the limit with the number of entries left in the queue
- $worker_queues = Config::get("system", "worker_queues", 4);
- $queue_length = Config::get('system', 'worker_fetch_limit', 1);
- $lower_job_limit = $worker_queues * $queue_length * 2;
- $entries = max($entries - $deferred, 0);
+ $ids = self::nextProcess();
- // Now do some magic
- $exponent = 2;
- $slope = $queue_length / pow($lower_job_limit, $exponent);
- $limit = min($queue_length, ceil($slope * pow($entries, $exponent)));
+ // If there is no result we check without priority limit
+ if (empty($ids)) {
+ $limit = Config::get('system', 'worker_fetch_limit', 1);
- Logger::log('Deferred: ' . $deferred . ' - Total: ' . $entries . ' - Maximum: ' . $queue_length . ' - jobs per queue: ' . $limit, Logger::DEBUG);
- $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']]
- );
+ $condition = ["`pid` = 0 AND NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()];
+ $tasks = DBA::select('workerqueue', ['id', 'parameter'], $condition, ['limit' => $limit, 'order' => ['priority', 'created']]);
self::$db_duration += (microtime(true) - $stamp);
- while ($id = DBA::fetch($result)) {
- $ids[] = $id["id"];
- }
- DBA::close($result);
-
- $found = (count($ids) > 0);
-
- 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']]
- );
- self::$db_duration += (microtime(true) - $stamp);
-
- while ($id = DBA::fetch($result)) {
- $ids[] = $id["id"];
+ while ($task = DBA::fetch($tasks)) {
+ $ids[] = $task['id'];
+ // Only continue that loop while we are storing commands that can be processed quickly
+ $command = json_decode($task['parameter'])[0];
+ if (!in_array($command, self::FAST_COMMANDS)) {
+ break;
}
- DBA::close($result);
-
- $found = (count($ids) > 0);
- $passing_slow = $found;
- }
- }
-
- // 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']]
- );
- self::$db_duration += (microtime(true) - $stamp);
-
- while ($id = DBA::fetch($result)) {
- $ids[] = $id["id"];
}
- DBA::close($result);
-
- $found = (count($ids) > 0);
+ DBA::close($tasks);
}
- if ($found) {
+ if (!empty($ids)) {
$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);
+ $condition = ['id' => $ids, 'done' => false, 'pid' => 0];
+ DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $condition);
self::$db_duration += (microtime(true) - $stamp);
self::$db_duration_write += (microtime(true) - $stamp);
}
- return $found;
+ return !empty($ids);
}
/**
* @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, &$entries, &$deferred)
+ public static function workerProcess()
{
// 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)) {
- return DBA::toArray($r);
+ $waiting = self::getWaitingJobForPID();
+ if (!empty($waiting)) {
+ return $waiting;
}
- DBA::close($r);
-
- // 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')) {
}
self::$lock_duration += (microtime(true) - $stamp);
- $found = self::findWorkerProcesses($passing_slow, $entries, $deferred);
+ $found = self::findWorkerProcesses();
Lock::release('worker_process');
}
$url = System::baseUrl()."/worker";
- Network::fetchUrl($url, false, $redirects, 1);
+ Network::fetchUrl($url, false, 1);
}
/**
$args = ['no_cron' => !$do_cron];
- get_app()->proc_run($command, $args);
+ $a = get_app();
+ $process = new Core\Process($a->getLogger(), $a->getMode(), $a->getConfig(), $a->getBasePath());
+ $process->run($command, $args);
// after spawning we have to remove the flag.
if (Config::get('system', 'worker_daemon_mode', false)) {
* @param (integer|array) priority or parameter array, strings are deprecated and are ignored
*
* next args are passed as $cmd command line
- * or: Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
+ * or: Worker::add(PRIORITY_HIGH, "Notifier", Delivery::DELETION, $drop_id);
* or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "CreateShadowEntry", $post_id);
*
* @return boolean "false" if proc_run couldn't be executed
}
$priority = PRIORITY_MEDIUM;
- $dont_fork = Config::get("system", "worker_dont_fork", false);
+ // Don't fork from frontend tasks by default
+ $dont_fork = Config::get("system", "worker_dont_fork", false) || !\get_app()->getMode()->isBackend();
$created = DateTimeFormat::utcNow();
$force_priority = false;
return true;
}
+ /**
+ * Returns the next retrial level for worker jobs.
+ * This function will skip levels when jobs are older.
+ *
+ * @param array $queue Worker queue entry
+ * @param integer $max_level maximum retrial level
+ * @return integer the next retrial level value
+ */
+ private static function getNextRetrial($queue, $max_level)
+ {
+ $created = strtotime($queue['created']);
+ $retrial_time = time() - $created;
+
+ $new_retrial = $queue['retrial'] + 1;
+ $total = 0;
+ for ($retrial = 0; $retrial <= $max_level + 1; ++$retrial) {
+ $delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
+ $total += $delay;
+ if (($total < $retrial_time) && ($retrial > $queue['retrial'])) {
+ $new_retrial = $retrial;
+ }
+ }
+ Logger::info('New retrial for task', ['id' => $queue['id'], 'created' => $queue['created'], 'old' => $queue['retrial'], 'new' => $new_retrial]);
+ return $new_retrial;
+ }
+
/**
* Defers the current worker entry
*/
$id = $queue['id'];
$priority = $queue['priority'];
- if ($retrial > 14) {
- Logger::log('Id ' . $id . ' had been tried 14 times. We stop now.', Logger::DEBUG);
+ $max_level = Config::get('system', 'worker_defer_limit');
+
+ $new_retrial = self::getNextRetrial($queue, $max_level);
+
+ if ($new_retrial > $max_level) {
+ Logger::info('The task exceeded the maximum retry count', ['id' => $id, 'max_level' => $max_level, 'retrial' => $new_retrial]);
return;
}
// Calculate the delay until the next trial
- $delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
+ $delay = (($new_retrial + 2) ** 4) + (rand(1, 30) * ($new_retrial));
$next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
- if (($priority < PRIORITY_MEDIUM) && ($retrial > 2)) {
+ if (($priority < PRIORITY_MEDIUM) && ($new_retrial > 3)) {
$priority = PRIORITY_MEDIUM;
- } elseif (($priority < PRIORITY_LOW) && ($retrial > 5)) {
+ } elseif (($priority < PRIORITY_LOW) && ($new_retrial > 6)) {
$priority = PRIORITY_LOW;
- } elseif (($priority < PRIORITY_NEGLIGIBLE) && ($retrial > 7)) {
+ } elseif (($priority < PRIORITY_NEGLIGIBLE) && ($new_retrial > 8)) {
$priority = PRIORITY_NEGLIGIBLE;
}
- Logger::log('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next . ' - priority old/new: ' . $queue['priority'] . '/' . $priority, Logger::DEBUG);
+ Logger::info('Deferred task', ['id' => $id, 'retrial' => $new_retrial, 'next_execution' => $next, 'old_prio' => $queue['priority'], 'new_prio' => $priority]);
$stamp = (float)microtime(true);
- $fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => DBA::NULL_DATETIME, 'pid' => 0, 'priority' => $priority];
+ $fields = ['retrial' => $new_retrial, '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);
projects / friendica.git / blobdiff