X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=f41636beda2ac6e82f7a608f1e7d5145031eae11;hb=2ec3a97393959e42d450e074271d2d622d25701f;hp=0a3f72db0454aceda708fcc5ed3434fab51b4a28;hpb=5df246e9afe9a5778786a691eb2bddcd6800114b;p=friendica.git diff --git a/src/Core/Worker.php b/src/Core/Worker.php index 0a3f72db04..f41636beda 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -1,31 +1,45 @@ . + * */ + namespace Friendica\Core; -use Friendica\BaseObject; +use Friendica\Core; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Process; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Logger\WorkerLogger; use Friendica\Util\Network; /** - * @file src/Core/Worker.php - * - * @brief Contains the class for the worker background job processing - */ - -/** - * @brief Worker methods + * Contains the class for the worker background job processing */ class Worker { const STATE_STARTUP = 1; // Worker is in startup. This takes most time. - const STATE_SHORT_LOOP = 2; // Worker is processing preassigned jobs, thus saving much 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_LONG_LOOP = 4; // Worker is processing the whole - long - 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; @@ -37,7 +51,7 @@ class Worker private static $state; /** - * @brief Processes the tasks that are in the workerqueue table + * Processes the tasks that are in the workerqueue table * * @param boolean $run_cron Should the cron processes be executed? * @return void @@ -45,15 +59,13 @@ class Worker */ public static function processQueue($run_cron = true) { - $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 - if ($a->isMaxLoadReached()) { + if (DI::process()->isMaxLoadReached()) { Logger::log('Pre check: maximum load reached, quitting.', Logger::DEBUG); return; } @@ -62,9 +74,9 @@ class Worker self::startProcess(); // Kill stale processes every 5 minutes - $last_cleanup = Config::get('system', 'worker_last_cleaned', 0); + $last_cleanup = DI::config()->get('system', 'worker_last_cleaned', 0); if (time() > ($last_cleanup + 300)) { - Config::set('system', 'worker_last_cleaned', time()); + DI::config()->set('system', 'worker_last_cleaned', time()); self::killStaleWorkers(); } @@ -75,7 +87,7 @@ class Worker } // Do we have too few memory? - if ($a->isMinMemoryReached()) { + if (DI::process()->isMinMemoryReached()) { Logger::log('Pre check: Memory limit reached, quitting.', Logger::DEBUG); return; } @@ -87,7 +99,7 @@ class Worker } // Possibly there are too much database processes that block the system - if ($a->isMaxProcessesReached()) { + if (DI::process()->isMaxProcessesReached()) { Logger::log('Pre check: maximum processes reached, quitting.', Logger::DEBUG); return; } @@ -102,6 +114,7 @@ class Worker // We fetch the next queue entry that is about to be executed while ($r = self::workerProcess()) { + $refetched = false; foreach ($r as $entry) { // Assure that the priority is an integer value $entry['priority'] = (int)$entry['priority']; @@ -112,38 +125,41 @@ class Worker return; } - // If possible we will fetch new jobs for this worker - if (!self::getWaitingJobForPID() && Lock::acquire('worker_process', 0)) { + // Trying to fetch new processes - but only once when successful + if (!$refetched && DI::lock()->acquire('worker_process', 0)) { self::findWorkerProcesses(); - Lock::release('worker_process'); + DI::lock()->release('worker_process'); self::$state = self::STATE_REFETCH; + $refetched = true; + } else { + self::$state = self::STATE_SHORT_LOOP; } } - if (self::$state != self::STATE_REFETCH) { + // To avoid the quitting of multiple workers only one worker at a time will execute the check + if (!self::getWaitingJobForPID()) { self::$state = self::STATE_LONG_LOOP; - } - // To avoid the quitting of multiple workers only one worker at a time will execute the check - if (Lock::acquire('worker', 0)) { + if (DI::lock()->acquire('worker', 0)) { // Count active workers and compare them with a maximum value that depends on the load - if (self::tooMuchWorkers()) { - 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); + DI::lock()->release('worker'); + return; + } - // Check free memory - if ($a->isMinMemoryReached()) { - Logger::log('Memory limit reached, quitting.', Logger::DEBUG); - Lock::release('worker'); - return; + // Check free memory + if (DI::process()->isMinMemoryReached()) { + Logger::log('Memory limit reached, quitting.', Logger::DEBUG); + DI::lock()->release('worker'); + return; + } + DI::lock()->release('worker'); } - Lock::release('worker'); } // Quit the worker once every cron interval - if (time() > ($starttime + (Config::get('system', 'cron_interval') * 60))) { + if (time() > ($starttime + (DI::config()->get('system', 'cron_interval') * 60))) { Logger::info('Process lifetime reached, respawning.'); self::spawnWorker(); return; @@ -151,14 +167,14 @@ class Worker } // Cleaning up. Possibly not needed, but it doesn't harm anything. - if (Config::get('system', 'worker_daemon_mode', false)) { + if (DI::config()->get('system', 'worker_daemon_mode', false)) { self::IPCSetJobState(false); } 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 + * Check if non executed tasks do exist in the worker queue * * @return boolean Returns "true" if tasks are existing * @throws \Exception @@ -172,7 +188,7 @@ class Worker } /** - * @brief Returns the number of deferred entries in the worker queue + * Returns the number of deferred entries in the worker queue * * @return integer Number of deferred entries in the worker queue * @throws \Exception @@ -180,14 +196,14 @@ class Worker 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; } /** - * @brief Returns the number of non executed entries in the worker queue + * Returns the number of non executed entries in the worker queue * * @return integer Number of non executed entries in the worker queue * @throws \Exception @@ -202,7 +218,7 @@ class Worker } /** - * @brief Returns the highest priority in the worker queue that isn't executed + * Returns the highest priority in the worker queue that isn't executed * * @return integer Number of active worker processes * @throws \Exception @@ -221,7 +237,7 @@ class Worker } /** - * @brief Returns if a process with the given priority is running + * Returns if a process with the given priority is running * * @param integer $priority The priority that should be checked * @@ -235,7 +251,7 @@ class Worker } /** - * @brief Execute a worker entry + * Execute a worker entry * * @param array $queue Workerqueue entry * @@ -244,18 +260,16 @@ class Worker */ public static function execute($queue) { - $a = \get_app(); - $mypid = getmypid(); // Quit when in maintenance - if (Config::get('system', 'maintenance', false, true)) { + if (DI::config()->get('system', 'maintenance', false, true)) { Logger::log("Maintenance mode - quit process ".$mypid, Logger::DEBUG); return false; } // Constantly check the number of parallel database processes - if ($a->isMaxProcessesReached()) { + if (DI::process()->isMaxProcessesReached()) { Logger::log("Max processes reached for process ".$mypid, Logger::DEBUG); return false; } @@ -294,7 +308,7 @@ class Worker $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()); + DI::config()->set('system', 'last_worker_execution', DateTimeFormat::utcNow()); } self::$db_duration = (microtime(true) - $stamp); self::$db_duration_write += (microtime(true) - $stamp); @@ -340,7 +354,7 @@ class Worker $stamp = (float)microtime(true); if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) { - Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow()); + DI::config()->set('system', 'last_worker_execution', DateTimeFormat::utcNow()); } self::$db_duration = (microtime(true) - $stamp); self::$db_duration_write += (microtime(true) - $stamp); @@ -356,7 +370,7 @@ class Worker } /** - * @brief Execute a function from the queue + * Execute a function from the queue * * @param array $queue Workerqueue entry * @param string $funcname name of the function @@ -367,20 +381,19 @@ class Worker */ private static function execFunction($queue, $funcname, $argv, $method_call) { - $a = \get_app(); + $a = DI::app(); $argc = count($argv); - $logger = $a->getLogger(); - $workerLogger = new WorkerLogger($logger, $funcname); + Logger::enableWorker($funcname); - $workerLogger ->info("Process start.", ['priority' => $queue["priority"], 'id' => $queue["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. - $a->getProfiler()->reset(); + DI::profiler()->reset(); $a->queue = $queue; @@ -390,13 +403,13 @@ class Worker unset($_SESSION); // Set the workerLogger as new default logger - Logger::init($workerLogger); if ($method_call) { call_user_func_array(sprintf('Friendica\Worker\%s::execute', $funcname), $argv); } else { $funcname($argv, $argc); } - Logger::init($logger); + + Logger::disableWorker(); unset($a->queue); @@ -416,7 +429,7 @@ class Worker $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]); + 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; @@ -424,32 +437,31 @@ class Worker self::$db_duration_stat = 0; self::$db_duration_write = 0; self::$lock_duration = 0; - self::$state = self::STATE_SHORT_LOOP; if ($duration > 3600) { - $logger->info('Longer than 1 hour.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); + Logger::info('Longer than 1 hour.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); } elseif ($duration > 600) { - $logger->info('Longer than 10 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); + Logger::info('Longer than 10 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); } elseif ($duration > 300) { - $logger->info('Longer than 5 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); + Logger::info('Longer than 5 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); } elseif ($duration > 120) { - $logger->info('Longer than 2 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); + Logger::info('Longer than 2 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]); } - $workerLogger->info('Process done.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration, 3)]); + Logger::info('Process done.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration, 3)]); - $a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname); + DI::profiler()->saveLog(DI::logger(), "ID " . $queue["id"] . ": " . $funcname); - $cooldown = Config::get("system", "worker_cooldown", 0); + $cooldown = DI::config()->get("system", "worker_cooldown", 0); if ($cooldown > 0) { - $logger->info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]); + Logger::info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]); sleep($cooldown); } } /** - * @brief Checks if the number of database connections has reached a critical limit. + * Checks if the number of database connections has reached a critical limit. * * @return bool Are more than 3/4 of the maximum connections used? * @throws \Friendica\Network\HTTPException\InternalServerErrorException @@ -457,10 +469,10 @@ class Worker private static function maxConnectionsReached() { // Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself. - $max = Config::get("system", "max_connections"); + $max = DI::config()->get("system", "max_connections"); // Fetch the percentage level where the worker will get active - $maxlevel = Config::get("system", "max_connections_level", 75); + $maxlevel = DI::config()->get("system", "max_connections_level", 75); if ($max == 0) { // the maximum number of possible user connections can be a system variable @@ -532,7 +544,8 @@ class Worker } /** - * @brief fix the queue entry if the worker process died + * fix the queue entry if the worker process died + * * @return void * @throws \Exception */ @@ -604,14 +617,14 @@ class Worker } /** - * @brief Checks if the number of active workers exceeds the given limits + * Checks if the number of active workers exceeds the given limits * * @return bool Are there too much workers running? * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function tooMuchWorkers() { - $queues = Config::get("system", "worker_queues", 10); + $queues = DI::config()->get("system", "worker_queues", 10); $maxqueues = $queues; @@ -620,21 +633,21 @@ class Worker // Decrease the number of workers at higher load $load = System::currentLoad(); if ($load) { - $maxsysload = intval(Config::get("system", "maxloadavg", 20)); + $maxsysload = intval(DI::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. * For some environments, this rapid decrease is not needed. * With exponent 1, you could have 20 max queues at idle and 13 at 37% of $maxsysload. */ - $exponent = intval(Config::get('system', 'worker_load_exponent', 3)); + $exponent = intval(DI::config()->get('system', 'worker_load_exponent', 3)); $slope = pow(max(0, $maxsysload - $load) / $maxsysload, $exponent); $queues = intval(ceil($slope * $maxqueues)); $processlist = ''; - if (Config::get('system', 'worker_jpm')) { - $intervals = explode(',', Config::get('system', 'worker_jpm_range')); + if (DI::config()->get('system', 'worker_jpm')) { + $intervals = explode(',', DI::config()->get('system', 'worker_jpm_range')); $jobs_per_minute = []; foreach ($intervals as $interval) { if ($interval == 0) { @@ -662,11 +675,11 @@ class Worker $deferred = self::deferredEntries(); - if (Config::get('system', 'worker_debug')) { + if (DI::config()->get('system', 'worker_debug')) { $waiting_processes = 0; // Now adding all processes with workerqueue 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()); + $jobs = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`"); self::$db_duration += (microtime(true) - $stamp); self::$db_duration_stat += (microtime(true) - $stamp); while ($entry = DBA::fetch($jobs)) { @@ -682,10 +695,8 @@ class Worker DBA::close($processes); } DBA::close($jobs); - $entries = $deferred + $waiting_processes; } else { - $entries = self::totalEntries(); - $waiting_processes = max(0, $entries - $deferred); + $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); @@ -698,11 +709,13 @@ class Worker DBA::close($jobs); } + $waiting_processes -= $deferred; + $listitem[0] = "0:" . max(0, $idle_workers); $processlist .= ' ('.implode(', ', $listitem).')'; - if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($active >= $queues) && self::entriesExists()) { + if (DI::config()->get("system", "worker_fastlane", false) && ($queues > 0) && ($active >= $queues) && self::entriesExists()) { $top_priority = self::highestPriority(); $high_running = self::processWithPriorityActive($top_priority); @@ -715,9 +728,9 @@ class Worker 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)) && self::entriesExists()) { + if (!DI::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)) { + if (DI::config()->get('system', 'worker_daemon_mode', false)) { self::IPCSetJobState(true); } else { self::spawnWorker(); @@ -726,7 +739,7 @@ class Worker } // if there are too much worker, we don't spawn a new one. - if (Config::get('system', 'worker_daemon_mode', false) && ($active > $queues)) { + if (DI::config()->get('system', 'worker_daemon_mode', false) && ($active > $queues)) { self::IPCSetJobState(false); } @@ -734,7 +747,7 @@ class Worker } /** - * @brief Returns the number of active worker processes + * Returns the number of active worker processes * * @return integer Number of active worker processes * @throws \Exception @@ -748,7 +761,7 @@ class Worker } /** - * @brief Returns waiting jobs for the current process id + * Returns waiting jobs for the current process id * * @return array waiting workerqueue jobs * @throws \Exception @@ -767,7 +780,7 @@ class Worker } /** - * @brief Returns the next jobs that should be executed + * Returns the next jobs that should be executed * * @return array array with next jobs * @throws \Exception @@ -780,28 +793,29 @@ class Worker return []; } - if ($priority <= PRIORITY_MEDIUM) { - $limit = Config::get('system', 'worker_fetch_limit', 1); - } else { - $limit = 1; - } + $limit = DI::config()->get('system', 'worker_fetch_limit', 1); $ids = []; $stamp = (float)microtime(true); $condition = ["`priority` = ? AND `pid` = 0 AND NOT `done` AND `next_try` < ?", $priority, DateTimeFormat::utcNow()]; - $tasks = DBA::select('workerqueue', ['id'], $condition, ['limit' => $limit, 'order' => ['created']]); + $tasks = DBA::select('workerqueue', ['id', 'parameter'], $condition, ['limit' => $limit, 'order' => ['created']]); self::$db_duration += (microtime(true) - $stamp); 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($tasks); - Logger::info('Found:', ['id' => $ids, 'priority' => $priority]); + Logger::info('Found:', ['priority' => $priority, 'id' => $ids]); return $ids; } /** - * @brief Returns the priority of the next workerqueue job + * Returns the priority of the next workerqueue job * * @return string priority * @throws \Exception @@ -874,7 +888,7 @@ class Worker } /** - * @brief Find and claim the next worker process for us + * Find and claim the next worker process for us * * @return boolean Have we found something? * @throws \Friendica\Network\HTTPException\InternalServerErrorException @@ -887,15 +901,22 @@ class Worker // If there is no result we check without priority limit if (empty($ids)) { + $limit = DI::config()->get('system', 'worker_fetch_limit', 1); + $stamp = (float)microtime(true); $condition = ["`pid` = 0 AND NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()]; - $result = DBA::select('workerqueue', ['id'], $condition, ['limit' => 1, 'order' => ['priority', 'created']]); + $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"]; + 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); + DBA::close($tasks); } if (!empty($ids)) { @@ -910,7 +931,7 @@ class Worker } /** - * @brief Returns the next worker process + * Returns the next worker process * * @return string SQL statement * @throws \Friendica\Network\HTTPException\InternalServerErrorException @@ -924,14 +945,14 @@ class Worker } $stamp = (float)microtime(true); - if (!Lock::acquire('worker_process')) { + if (!DI::lock()->acquire('worker_process')) { return false; } self::$lock_duration += (microtime(true) - $stamp); $found = self::findWorkerProcesses(); - Lock::release('worker_process'); + DI::lock()->release('worker_process'); if ($found) { $stamp = (float)microtime(true); @@ -943,7 +964,8 @@ class Worker } /** - * @brief Removes a workerqueue entry from the current process + * Removes a workerqueue entry from the current process + * * @return void * @throws \Exception */ @@ -958,28 +980,30 @@ class Worker } /** - * @brief Call the front end worker + * Call the front end worker + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function callWorker() { - if (!Config::get("system", "frontend_worker")) { + if (!DI::config()->get("system", "frontend_worker")) { return; } - $url = System::baseUrl()."/worker"; - Network::fetchUrl($url, false, $redirects, 1); + $url = DI::baseUrl() . '/worker'; + Network::fetchUrl($url, false, 1); } /** - * @brief Call the front end worker if there aren't any active + * Call the front end worker if there aren't any active + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function executeIfIdle() { - if (!Config::get("system", "frontend_worker")) { + if (!DI::config()->get("system", "frontend_worker")) { return; } @@ -987,11 +1011,11 @@ class Worker if (function_exists("proc_open")) { // When was the last time that we called the worker? // Less than one minute? Then we quit - if ((time() - Config::get("system", "worker_started")) < 60) { + if ((time() - DI::config()->get("system", "worker_started")) < 60) { return; } - Config::set("system", "worker_started", time()); + DI::config()->set("system", "worker_started", time()); // Do we have enough running workers? Then we quit here. if (self::tooMuchWorkers()) { @@ -1024,13 +1048,14 @@ class Worker } /** - * @brief Removes long running worker processes + * Removes long running worker processes + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function clearProcesses() { - $timeout = Config::get("system", "frontend_worker_timeout", 10); + $timeout = DI::config()->get("system", "frontend_worker_timeout", 10); /// @todo We should clean up the corresponding workerqueue entries as well $stamp = (float)microtime(true); @@ -1042,7 +1067,8 @@ class Worker } /** - * @brief Runs the cron processes + * Runs the cron processes + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ @@ -1061,7 +1087,8 @@ class Worker } /** - * @brief Spawns a new worker + * Spawns a new worker + * * @param bool $do_cron * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException @@ -1072,24 +1099,26 @@ class Worker $args = ['no_cron' => !$do_cron]; - get_app()->proc_run($command, $args); + $a = DI::app(); + $process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath()); + $process->run($command, $args); // after spawning we have to remove the flag. - if (Config::get('system', 'worker_daemon_mode', false)) { + if (DI::config()->get('system', 'worker_daemon_mode', false)) { self::IPCSetJobState(false); } } /** - * @brief Adds tasks to the worker queue + * Adds tasks to the worker queue * * @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 + * @return boolean "false" if worker queue entry already existed or there had been an error * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @note $cmd and string args are surrounded with "" * @@ -1113,7 +1142,8 @@ class Worker } $priority = PRIORITY_MEDIUM; - $dont_fork = Config::get("system", "worker_dont_fork", false); + // Don't fork from frontend tasks by default + $dont_fork = DI::config()->get("system", "worker_dont_fork", false) || !DI::mode()->isBackend(); $created = DateTimeFormat::utcNow(); $force_priority = false; @@ -1138,6 +1168,7 @@ class Worker $parameters = json_encode($args); $found = DBA::exists('workerqueue', ['parameter' => $parameters, 'done' => false]); + $added = false; // Quit if there was a database error - a precaution for the update process to 3.5.3 if (DBA::errorNo() != 0) { @@ -1145,86 +1176,121 @@ class Worker } if (!$found) { - DBA::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]); + $added = DBA::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]); + if (!$added) { + return false; + } } elseif ($force_priority) { DBA::update('workerqueue', ['priority' => $priority], ['parameter' => $parameters, 'done' => false, 'pid' => 0]); } // Should we quit and wait for the worker to be called as a cronjob? if ($dont_fork) { - return true; + return $added; } // If there is a lock then we don't have to check for too much worker - if (!Lock::acquire('worker', 0)) { - return true; + if (!DI::lock()->acquire('worker', 0)) { + return $added; } // If there are already enough workers running, don't fork another one $quit = self::tooMuchWorkers(); - Lock::release('worker'); + DI::lock()->release('worker'); if ($quit) { - return true; + return $added; } // We tell the daemon that a new job entry exists - if (Config::get('system', 'worker_daemon_mode', false)) { + if (DI::config()->get('system', 'worker_daemon_mode', false)) { // We don't have to set the IPC flag - this is done in "tooMuchWorkers" - return true; + return $added; } // Now call the worker to execute the jobs that we just added to the queue self::spawnWorker(); - return true; + return $added; + } + + /** + * 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 + * + * @return boolean had the entry been deferred? */ public static function defer() { - if (empty(BaseObject::getApp()->queue)) { - return; + if (empty(DI::app()->queue)) { + return false; } - $queue = BaseObject::getApp()->queue; + $queue = DI::app()->queue; $retrial = $queue['retrial']; $id = $queue['id']; $priority = $queue['priority']; - if ($retrial > 14) { - Logger::log('Id ' . $id . ' had been tried 14 times. We stop now.', Logger::DEBUG); - return; + $max_level = DI::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, 'created' => $queue['created'], 'old_prio' => $queue['priority'], 'old_retrial' => $queue['retrial'], 'max_level' => $max_level, 'retrial' => $new_retrial]); + return false; } // 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, 'created' => $queue['created'], '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); + + return true; } /** * Log active processes into the "process" table - * - * @brief Log active processes into the "process" table */ public static function startProcess() { @@ -1240,7 +1306,6 @@ class Worker /** * Remove the active process from the "process" table * - * @brief Remove the active process from the "process" table * @return bool * @throws \Exception */ @@ -1252,7 +1317,6 @@ class Worker /** * Set the flag if some job is waiting * - * @brief Set the flag if some job is waiting * @param boolean $jobs Is there a waiting job? * @throws \Exception */ @@ -1267,7 +1331,6 @@ class Worker /** * Checks if some worker job waits to be executed * - * @brief Checks if some worker job waits to be executed * @return bool * @throws \Exception */