X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=723cd809da44d3230721afd1eb4e06cf5a17ffb7;hb=389685e09944e3823effd2e820ab2fd95d8b4b32;hp=0e8835a1564972a62ed40968789a498a89f418ab;hpb=a57e6cfa1b6c1e7c75698b2e804b917edff671e9;p=friendica.git diff --git a/src/Core/Worker.php b/src/Core/Worker.php index 0e8835a156..723cd809da 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -4,15 +4,11 @@ */ namespace Friendica\Core; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Process; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; -use Friendica\Util\Lock; -use dba; +use Friendica\BaseObject; require_once 'include/dba.php'; @@ -45,7 +41,7 @@ class Worker self::$up_start = microtime(true); // At first check the maximum load. We shouldn't continue with a high load - if ($a->maxload_reached()) { + if ($a->isMaxLoadReached()) { logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG); return; } @@ -67,7 +63,7 @@ class Worker } // Do we have too few memory? - if ($a->min_memory_reached()) { + if ($a->isMinMemoryReached()) { logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG); return; } @@ -79,7 +75,7 @@ class Worker } // Possibly there are too much database processes that block the system - if ($a->max_processes_reached()) { + if ($a->isMaxProcessesReached()) { logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG); return; } @@ -108,29 +104,31 @@ class Worker } // If possible we will fetch new jobs for this worker - if (!$refetched && Lock::acquireLock('worker_process', 0)) { + if (!$refetched && Lock::acquire('worker_process', 0)) { $stamp = (float)microtime(true); $refetched = self::findWorkerProcesses($passing_slow); self::$db_duration += (microtime(true) - $stamp); - Lock::releaseLock('worker_process'); + Lock::release('worker_process'); } } // To avoid the quitting of multiple workers only one worker at a time will execute the check - if (Lock::acquireLock('worker', 0)) { + 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()) { logger('Active worker limit reached, quitting.', LOGGER_DEBUG); + Lock::release('worker'); return; } // Check free memory - if ($a->min_memory_reached()) { + if ($a->isMinMemoryReached()) { logger('Memory limit reached, quitting.', LOGGER_DEBUG); + Lock::release('worker'); return; } - Lock::releaseLock('worker'); + Lock::release('worker'); self::$db_duration += (microtime(true) - $stamp); } @@ -145,7 +143,7 @@ class Worker if (Config::get('system', 'worker_daemon_mode', false)) { self::IPCSetJobState(false); } - logger("Couldn't select a workerqueue entry, quitting.", LOGGER_DEBUG); + logger("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", LOGGER_DEBUG); } /** @@ -155,7 +153,8 @@ class Worker */ private static function totalEntries() { - return dba::count('workerqueue', ["`executed` <= ? AND NOT `done`", NULL_DATE]); + return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?", + NULL_DATE, DateTimeFormat::utcNow()]); } /** @@ -165,9 +164,9 @@ class Worker */ private static function highestPriority() { - $condition = ["`executed` <= ? AND NOT `done`", NULL_DATE]; - $workerqueue = dba::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]); - if (DBM::is_result($workerqueue)) { + $condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", NULL_DATE, DateTimeFormat::utcNow()]; + $workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]); + if (DBA::isResult($workerqueue)) { return $workerqueue["priority"]; } else { return 0; @@ -183,8 +182,9 @@ class Worker */ private static function processWithPriorityActive($priority) { - $condition = ["`priority` <= ? AND `executed` > ? AND NOT `done`", $priority, NULL_DATE]; - return dba::exists('workerqueue', $condition); + $condition = ["`priority` <= ? AND `executed` > ? AND NOT `done` AND `next_try` < ?", + $priority, NULL_DATE, DateTimeFormat::utcNow()]; + return DBA::exists('workerqueue', $condition); } /** @@ -207,7 +207,7 @@ class Worker } // Constantly check the number of parallel database processes - if ($a->max_processes_reached()) { + if ($a->isMaxProcessesReached()) { logger("Max processes reached for process ".$mypid, LOGGER_DEBUG); return false; } @@ -234,7 +234,7 @@ class Worker if ($age > 1) { $stamp = (float)microtime(true); - dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]); + DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]); self::$db_duration += (microtime(true) - $stamp); } @@ -243,7 +243,7 @@ class Worker self::execFunction($queue, $include, $argv, true); $stamp = (float)microtime(true); - if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) { + if (DBA::update('workerqueue', ['done' => true], ['id' => $queue['id']])) { Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow()); } self::$db_duration = (microtime(true) - $stamp); @@ -258,7 +258,7 @@ class Worker if (!validate_include($include)) { logger("Include file ".$argv[0]." is not valid!"); - dba::delete('workerqueue', ['id' => $queue["id"]]); + DBA::delete('workerqueue', ['id' => $queue["id"]]); return true; } @@ -277,20 +277,20 @@ class Worker if ($age > 1) { $stamp = (float)microtime(true); - dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]); + DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]); self::$db_duration += (microtime(true) - $stamp); } self::execFunction($queue, $funcname, $argv, false); $stamp = (float)microtime(true); - if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) { + if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) { Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow()); } self::$db_duration = (microtime(true) - $stamp); } else { logger("Function ".$funcname." does not exist"); - dba::delete('workerqueue', ['id' => $queue["id"]]); + DBA::delete('workerqueue', ['id' => $queue["id"]]); } return true; @@ -313,7 +313,7 @@ class Worker $argc = count($argv); - $new_process_id = uniqid("wrk", true); + $new_process_id = System::processID("wrk"); logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id); @@ -356,7 +356,7 @@ class Worker $a->process_id = $old_process_id; unset($a->queue); - $duration = number_format(microtime(true) - $stamp, 3); + $duration = (microtime(true) - $stamp); self::$up_start = microtime(true); @@ -481,13 +481,13 @@ class Worker if ($max == 0) { // the maximum number of possible user connections can be a system variable - $r = dba::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'"); - if (DBM::is_result($r)) { + $r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'"); + if (DBA::isResult($r)) { $max = $r["Value"]; } // Or it can be granted. This overrides the system variable - $r = dba::p('SHOW GRANTS'); - while ($grants = dba::fetch($r)) { + $r = DBA::p('SHOW GRANTS'); + while ($grants = DBA::fetch($r)) { $grant = array_pop($grants); if (stristr($grant, "GRANT USAGE ON")) { if (preg_match("/WITH MAX_USER_CONNECTIONS (\d*)/", $grant, $match)) { @@ -495,15 +495,15 @@ class Worker } } } - dba::close($r); + DBA::close($r); } // 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) { - $r = dba::p('SHOW PROCESSLIST'); - $used = dba::num_rows($r); - dba::close($r); + $r = DBA::p('SHOW PROCESSLIST'); + $used = DBA::numRows($r); + DBA::close($r); logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG); @@ -517,16 +517,16 @@ class Worker // We will now check for the system values. // This limit could be reached although the user limits are fine. - $r = dba::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_connections'"); - if (!DBM::is_result($r)) { + $r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_connections'"); + if (!DBA::isResult($r)) { return false; } $max = intval($r["Value"]); if ($max == 0) { return false; } - $r = dba::fetch_first("SHOW STATUS WHERE `variable_name` = 'Threads_connected'"); - if (!DBM::is_result($r)) { + $r = DBA::fetchFirst("SHOW STATUS WHERE `variable_name` = 'Threads_connected'"); + if (!DBA::isResult($r)) { return false; } $used = intval($r["Value"]); @@ -550,16 +550,16 @@ class Worker */ private static function killStaleWorkers() { - $entries = dba::select( + $entries = DBA::select( 'workerqueue', ['id', 'pid', 'executed', 'priority', 'parameter'], ['`executed` > ? AND NOT `done` AND `pid` != 0', NULL_DATE], ['order' => ['priority', 'created']] ); - while ($entry = dba::fetch($entries)) { + while ($entry = DBA::fetch($entries)) { if (!posix_kill($entry["pid"], 0)) { - dba::update( + DBA::update( 'workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['id' => $entry["id"]] @@ -581,7 +581,7 @@ class Worker // How long is the process already running? $duration = (time() - strtotime($entry["executed"])) / 60; if ($duration > $max_duration) { - logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now."); + logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") took more than ".$max_duration." minutes. It will be killed now."); posix_kill($entry["pid"], SIGTERM); // We killed the stale process. @@ -595,13 +595,13 @@ class Worker } elseif ($entry["priority"] != PRIORITY_CRITICAL) { $new_priority = PRIORITY_NEGLIGIBLE; } - dba::update( + DBA::update( 'workerqueue', ['executed' => NULL_DATE, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0], ['id' => $entry["id"]] ); } else { - logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG); + logger("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); } } } @@ -621,7 +621,7 @@ class Worker $active = self::activeWorkers(); // Decrease the number of workers at higher load - $load = current_load(); + $load = System::currentLoad(); if ($load) { $maxsysload = intval(Config::get("system", "maxloadavg", 50)); @@ -641,37 +641,37 @@ class Worker $listitem = []; // Adding all processes with no workerqueue entry - $processes = dba::p( + $processes = DBA::p( "SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS (SELECT id FROM `workerqueue` WHERE `workerqueue`.`pid` = `process`.`pid` AND NOT `done` AND `pid` != ?)", getmypid() ); - if ($process = dba::fetch($processes)) { + if ($process = DBA::fetch($processes)) { $listitem[0] = "0:".$process["running"]; } - dba::close($processes); + DBA::close($processes); // 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)) { - $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]); - if ($process = dba::fetch($processes)) { + $entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`"); + while ($entry = DBA::fetch($entries)) { + $processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]); + if ($process = DBA::fetch($processes)) { $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"]; } - dba::close($processes); + DBA::close($processes); } - dba::close($entries); + DBA::close($entries); $intervals = [1, 10, 60]; $jobs_per_minute = []; foreach ($intervals as $interval) { - $jobs = dba::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ".intval($interval)." MINUTE"); - if ($job = dba::fetch($jobs)) { + $jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ".intval($interval)." MINUTE"); + if ($job = DBA::fetch($jobs)) { $jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0); } - dba::close($jobs); + DBA::close($jobs); } $processlist = ' - jpm: '.implode('/', $jobs_per_minute).' ('.implode(', ', $listitem).')'; } @@ -716,7 +716,7 @@ class Worker */ private static function activeWorkers() { - return dba::count('process', ['command' => 'Worker.php']); + return DBA::count('process', ['command' => 'Worker.php']); } /** @@ -732,21 +732,21 @@ class Worker { $highest_priority = 0; - $r = dba::p( + $r = DBA::p( "SELECT `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done`" ); // No active processes at all? Fine - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { return false; } $priorities = []; - while ($line = dba::fetch($r)) { + while ($line = DBA::fetch($r)) { $priorities[] = $line["priority"]; } - dba::close($r); + DBA::close($r); // Should not happen if (count($priorities) == 0) { @@ -805,33 +805,35 @@ class Worker $ids = []; if (self::passingSlow($highest_priority)) { // Are there waiting processes with a higher priority than the currently highest? - $result = dba::select( + $result = DBA::select( 'workerqueue', ['id'], - ["`executed` <= ? AND `priority` < ? AND NOT `done`", NULL_DATE, $highest_priority], + ["`executed` <= ? AND `priority` < ? AND NOT `done` AND `next_try` < ?", + NULL_DATE, $highest_priority, DateTimeFormat::utcNow()], ['limit' => $limit, 'order' => ['priority', 'created']] ); - while ($id = dba::fetch($result)) { + while ($id = DBA::fetch($result)) { $ids[] = $id["id"]; } - dba::close($result); + DBA::close($result); $found = (count($ids) > 0); if (!$found) { // Give slower processes some processing time - $result = dba::select( + $result = DBA::select( 'workerqueue', ['id'], - ["`executed` <= ? AND `priority` > ? AND NOT `done`", NULL_DATE, $highest_priority], + ["`executed` <= ? AND `priority` > ? AND NOT `done` AND `next_try` < ?", + NULL_DATE, $highest_priority, DateTimeFormat::utcNow()], ['limit' => $limit, 'order' => ['priority', 'created']] ); - while ($id = dba::fetch($result)) { + while ($id = DBA::fetch($result)) { $ids[] = $id["id"]; } - dba::close($result); + DBA::close($result); $found = (count($ids) > 0); $passing_slow = $found; @@ -840,17 +842,18 @@ class Worker // If there is no result (or we shouldn't pass lower processes) we check without priority limit if (!$found) { - $result = dba::select( + $result = DBA::select( 'workerqueue', ['id'], - ["`executed` <= ? AND NOT `done`", NULL_DATE], + ["`executed` <= ? AND NOT `done` AND `next_try` < ?", + NULL_DATE, DateTimeFormat::utcNow()], ['limit' => $limit, 'order' => ['priority', 'created']] ); - while ($id = dba::fetch($result)) { + while ($id = DBA::fetch($result)) { $ids[] = $id["id"]; } - dba::close($result); + DBA::close($result); $found = (count($ids) > 0); } @@ -858,7 +861,7 @@ class Worker if ($found) { $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); + DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $ids); } return $found; @@ -875,15 +878,15 @@ class Worker $stamp = (float)microtime(true); // There can already be jobs for us in the queue. - $r = dba::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]); - if (DBM::is_result($r)) { + $r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]); + if (DBA::isResult($r)) { self::$db_duration += (microtime(true) - $stamp); - return dba::inArray($r); + return DBA::toArray($r); } - dba::close($r); + DBA::close($r); $stamp = (float)microtime(true); - if (!Lock::acquireLock('worker_process')) { + if (!Lock::acquire('worker_process')) { return false; } self::$lock_duration = (microtime(true) - $stamp); @@ -892,11 +895,11 @@ class Worker $found = self::findWorkerProcesses($passing_slow); self::$db_duration += (microtime(true) - $stamp); - Lock::releaseLock('worker_process'); + Lock::release('worker_process'); if ($found) { - $r = dba::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]); - return dba::inArray($r); + $r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]); + return DBA::toArray($r); } return false; } @@ -909,7 +912,7 @@ class Worker { $mypid = getmypid(); - dba::update('workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['pid' => $mypid, 'done' => false]); + DBA::update('workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['pid' => $mypid, 'done' => false]); } /** @@ -987,7 +990,7 @@ class Worker /// @todo We should clean up the corresponding workerqueue entries as well $condition = ["`created` < ? AND `command` = 'worker.php'", DateTimeFormat::utc("now - ".$timeout." minutes")]; - dba::delete('process', $condition); + DBA::delete('process', $condition); } /** @@ -1014,13 +1017,11 @@ class Worker */ public static function spawnWorker($do_cron = false) { - $args = ["bin/worker.php"]; + $command = 'bin/worker.php'; - if (!$do_cron) { - $args[] = "no_cron"; - } + $args = ['no_cron' => !$do_cron]; - get_app()->proc_run($args); + get_app()->proc_run($command, $args); // after spawning we have to remove the flag. if (Config::get('system', 'worker_daemon_mode', false)) { @@ -1080,15 +1081,15 @@ class Worker } $parameters = json_encode($args); - $found = dba::exists('workerqueue', ['parameter' => $parameters, 'done' => false]); + $found = DBA::exists('workerqueue', ['parameter' => $parameters, 'done' => false]); // Quit if there was a database error - a precaution for the update process to 3.5.3 - if (dba::errorNo() != 0) { + if (DBA::errorNo() != 0) { return false; } if (!$found) { - dba::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]); + DBA::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]); } // Should we quit and wait for the worker to be called as a cronjob? @@ -1097,13 +1098,13 @@ class Worker } // If there is a lock then we don't have to check for too much worker - if (!Lock::acquireLock('worker', 0)) { + if (!Lock::acquire('worker', 0)) { return true; } // If there are already enough workers running, don't fork another one $quit = self::tooMuchWorkers(); - Lock::releaseLock('worker'); + Lock::release('worker'); if ($quit) { return true; @@ -1121,6 +1122,35 @@ class Worker return true; } + /** + * Defers the current worker entry + */ + public static function defer() + { + if (empty(BaseObject::getApp()->queue)) { + return; + } + + $queue = BaseObject::getApp()->queue; + + $retrial = $queue['retrial']; + $id = $queue['id']; + + if ($retrial > 14) { + logger('Id ' . $id . ' had been tried 14 times, it will be deleted now.', LOGGER_DEBUG); + DBA::delete('workerqueue', ['id' => $id]); + } + + // Calculate the delay until the next trial + $delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1)); + $next = DateTimeFormat::utc('now + ' . $delay . ' seconds'); + + logger('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG); + + $fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => NULL_DATE, 'pid' => 0]; + DBA::update('workerqueue', $fields, ['id' => $id]); + } + /** * Log active processes into the "process" table * @@ -1156,7 +1186,7 @@ class Worker */ public static function IPCSetJobState($jobs) { - dba::update('worker-ipc', ['jobs' => $jobs], ['key' => 1], true); + DBA::update('worker-ipc', ['jobs' => $jobs], ['key' => 1], true); } /** @@ -1167,10 +1197,10 @@ class Worker */ public static function IPCJobsExists() { - $row = dba::selectFirst('worker-ipc', ['jobs'], ['key' => 1]); + $row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => 1]); // When we don't have a row, no job is running - if (!DBM::is_result($row)) { + if (!DBA::isResult($row)) { return false; }