Merge pull request #2758 from annando/1609-sql-charset

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index b54757b00bf1bb9f9b5aa7ffc9eb9fee3b4dd7e2..0835528717cbe81ab56b26d599e410a6f5a4756b 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -46,10 +46,10 @@ function poller_run(&$argv, &$argc){
 
        if(($argc <= 1) OR ($argv[1] != "no_cron")) {
                // Run the cron job that calls all other jobs
-               proc_run("php","include/cron.php");
+               proc_run(PRIORITY_MEDIUM, "include/cron.php");
 
                // Run the cronhooks job separately from cron for being able to use a different timing
-               proc_run("php","include/cronhooks.php");
+               proc_run(PRIORITY_MEDIUM, "include/cronhooks.php");
 
                // Cleaning dead processes
                poller_kill_stale_workers();
@@ -217,7 +217,7 @@ function poller_max_connections_reached() {
  *
  */
 function poller_kill_stale_workers() {
-       $r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+       $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
 
        if (!dbm::is_result($r)) {
                // No processing here needed
@@ -230,17 +230,34 @@ function poller_kill_stale_workers() {
                                intval($pid["pid"]));
                else {
                        // Kill long running processes
+
+                       // Check if the priority is in a valid range
+                       if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE)))
+                               $pid["priority"] = PRIORITY_MEDIUM;
+
+                       // Define the maximum durations
+                       $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
+                       $max_duration = $max_duration_defaults[$pid["priority"]];
+
+                       $argv = json_decode($pid["parameter"]);
+                       $argv[0] = basename($argv[0]);
+
+                       // How long is the process already running?
                        $duration = (time() - strtotime($pid["executed"])) / 60;
-                       if ($duration > 180) {
-                               logger("Worker process ".$pid["pid"]." took more than 3 hours. It will be killed now.");
+                       if ($duration > $max_duration) {
+                               logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now.");
                                posix_kill($pid["pid"], SIGTERM);
 
-                               // Question: If a process is stale: Should we remove it or should we reschedule it?
-                               // By now we rescheduling it. It's maybe not the wisest decision?
-                               q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
+                               // We killed the stale process.
+                               // To avoid a blocking situation we reschedule the process at the beginning of the queue.
+                               // Additionally we are lowering the priority.
+                               q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s',
+                                                       `priority` = %d, `pid` = 0 WHERE `pid` = %d",
+                                       dbesc(datetime_convert()),
+                                       intval(PRIORITY_NEGLIGIBLE),
                                        intval($pid["pid"]));
                        } else
-                               logger("Worker process ".$pid["pid"]." now runs for ".round($duration)." minutes. That's okay.", LOGGER_DEBUG);
+                               logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
                }
 }
 
@@ -273,6 +290,20 @@ function poller_too_much_workers() {
                $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'");
                $entries = $s[0]["total"];
 
+               if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($entries > 0) AND ($active >= $queues)) {
+                       $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority` LIMIT 1");
+                       $top_priority = $s[0]["priority"];
+
+                       $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00' LIMIT 1",
+                               intval($top_priority));
+                       $high_running = dbm::is_result($s);
+
+                       if (!$high_running AND ($top_priority > PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_NEGLIGIBLE)) {
+                               logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
+                               $queues = $active + 1;
+                       }
+               }
+
                logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$entries." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
                // Are there fewer workers running as possible? Then fork a new one.