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

Merge pull request #6655 from annando/worker-limit 

Worker: Changed behaviour of "worker_fetch_limit" config value
This commit is contained in:
Hypolite Petovan 2019-02-14 08:45:19 -05:00 committed by GitHub
parent 6aba6a3945 ca529d9de7
commit fe57583e2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Core/Worker.php
View File

@ -370,7 +370,9 @@ class Worker
$argc = count($argv); $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); Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
@ -448,7 +450,7 @@ class Worker
Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", Logger::DEBUG); 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 // Write down the performance values into the log
if (Config::get("system", "profiler")) { if (Config::get("system", "profiler")) {
@ -930,7 +932,7 @@ class Worker
['id'], ['id'],
["`pid` = 0 AND `priority` < ? AND NOT `done` AND `next_try` < ?", ["`pid` = 0 AND `priority` < ? AND NOT `done` AND `next_try` < ?",
$highest_priority, DateTimeFormat::utcNow()], $highest_priority, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']] ['limit' => 1, 'order' => ['priority', 'created']]
); );
self::$db_duration += (microtime(true) - $stamp); self::$db_duration += (microtime(true) - $stamp);
@ -949,7 +951,7 @@ class Worker
['id'], ['id'],
["`pid` = 0 AND `priority` > ? AND NOT `done` AND `next_try` < ?", ["`pid` = 0 AND `priority` > ? AND NOT `done` AND `next_try` < ?",
$highest_priority, DateTimeFormat::utcNow()], $highest_priority, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']] ['limit' => 1, 'order' => ['priority', 'created']]
); );
self::$db_duration += (microtime(true) - $stamp); self::$db_duration += (microtime(true) - $stamp);
@ -963,6 +965,26 @@ class Worker
} }
} }
// 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 there is no result (or we shouldn't pass lower processes) we check without priority limit
if (!$found) { if (!$found) {
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
@ -971,7 +993,7 @@ class Worker
['id'], ['id'],
["`pid` = 0 AND NOT `done` AND `next_try` < ?", ["`pid` = 0 AND NOT `done` AND `next_try` < ?",
DateTimeFormat::utcNow()], DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']] ['limit' => 1, 'order' => ['priority', 'created']]
); );
self::$db_duration += (microtime(true) - $stamp); self::$db_duration += (microtime(true) - $stamp);