]> git.mxchange.org Git - friendica.git/blobdiff - include/poller.php
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
[friendica.git] / include / poller.php
index ae249ffe46ddc41f8be766534fdfbaa7b4e1c696..0c5bebbda57f911de9e82da7ff326cd28dc372b2 100644 (file)
@@ -73,6 +73,10 @@ function poller_run($argv, $argc){
 
        while ($r = poller_worker_process()) {
 
+               if (!poller_claim_process($r[0])) {
+                       continue;
+               }
+
                // Check free memory
                if ($a->min_memory_reached()) {
                        return;
@@ -108,43 +112,22 @@ function poller_execute($queue) {
 
        // Quit when in maintenance
        if (Config::get('system', 'maintenance', true)) {
+               logger("Maintenance mode - quit process ".$mypid, LOGGER_DEBUG);
                return false;
        }
 
        // Constantly check the number of parallel database processes
        if ($a->max_processes_reached()) {
+               logger("Max processes reached for process ".$mypid, LOGGER_DEBUG);
                return false;
        }
 
        // Constantly check the number of available database connections to let the frontend be accessible at any time
        if (poller_max_connections_reached()) {
+               logger("Max connection reached for process ".$mypid, LOGGER_DEBUG);
                return false;
        }
 
-       if (!dba::update('workerqueue', array('executed' => datetime_convert(), 'pid' => $mypid),
-                       array('id' => $queue["id"], 'pid' => 0))) {
-               logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG);
-               dba::commit();
-               return true;
-       }
-
-       // Assure that there are no tasks executed twice
-       $id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
-       if (!$id) {
-               logger("Queue item ".$queue["id"]." vanished - skip this execution", LOGGER_DEBUG);
-               dba::commit();
-               return true;
-       } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
-               logger("Entry for queue item ".$queue["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
-               dba::commit();
-               return true;
-       } elseif ($id[0]["pid"] != $mypid) {
-               logger("Queue item ".$queue["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
-               dba::commit();
-               return true;
-       }
-       dba::commit();
-
        $argv = json_decode($queue["parameter"]);
 
        // Check for existance and validity of the include file
@@ -417,11 +400,9 @@ function poller_too_much_workers() {
 
        $maxqueues = $queues;
 
-       $active = poller_active_workers();
-
        // Decrease the number of workers at higher load
        $load = current_load();
-       if($load) {
+       if ($load) {
                $maxsysload = intval(Config::get("system", "maxloadavg", 50));
 
                $maxworkers = $queues;
@@ -431,6 +412,33 @@ function poller_too_much_workers() {
                $slope = $maxworkers / pow($maxsysload, $exponent);
                $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
 
+               $active = 0;
+
+               // Create a list of queue entries grouped by their priority
+               $listitem = array();
+
+               // Adding all processes with no workerqueue entry
+               $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS (SELECT id FROM `workerqueue` WHERE `workerqueue`.`pid` = `process`.`pid`)");
+               if ($process = dba::fetch($processes)) {
+                       $listitem[0] = "0:".$process["running"];
+                       $active += $process["running"];
+               }
+               dba::close($processes);
+
+               // Now adding all processes with workerqueue entries
+               $entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` GROUP BY `priority`");
+               while ($entry = dba::fetch($entries)) {
+                       $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` LEFT JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE `priority` = ?", $entry["priority"]);
+                       if ($process = dba::fetch($processes)) {
+                               $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
+                               $active += $process["running"];
+                       }
+                       dba::close($processes);
+               }
+               dba::close($entries);
+
+               $processlist = implode(', ', $listitem);
+
                $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE));
                $entries = $s[0]["total"];
 
@@ -448,27 +456,6 @@ function poller_too_much_workers() {
                        }
                }
 
-               // Create a list of queue entries grouped by their priority
-               $running = array(PRIORITY_CRITICAL => 0,
-                               PRIORITY_HIGH => 0,
-                               PRIORITY_MEDIUM => 0,
-                               PRIORITY_LOW => 0,
-                               PRIORITY_NEGLIGIBLE => 0);
-
-               $r = q("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` GROUP BY `priority`");
-               if (dbm::is_result($r))
-                       foreach ($r AS $process)
-                               $running[$process["priority"]] = $process["running"];
-
-               $processlist = "";
-               $r = q("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` GROUP BY `priority`");
-               if (dbm::is_result($r))
-                       foreach ($r as $entry) {
-                               if ($processlist != "")
-                                       $processlist .= ", ";
-                               $processlist .= $entry["priority"].":".$running[$entry["priority"]]."/".$entry["entries"];
-                       }
-
                logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries." (".$processlist.") - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
                // Are there fewer workers running as possible? Then fork a new one.
@@ -478,6 +465,8 @@ function poller_too_much_workers() {
                        $a = get_app();
                        $a->proc_run($args);
                }
+       } else {
+               $active = poller_active_workers();
        }
 
        return($active >= $queues);
@@ -560,7 +549,7 @@ function poller_worker_process() {
                // Are there waiting processes with a higher priority than the currently highest?
                $r = q("SELECT * FROM `workerqueue`
                                WHERE `executed` <= '%s' AND `priority` < %d
-                               ORDER BY `priority`, `created` LIMIT 1",
+                               ORDER BY `priority`, `created` LIMIT 1 FOR UPDATE",
                                dbesc(NULL_DATE),
                                intval($highest_priority));
                if (dbm::is_result($r)) {
@@ -569,18 +558,70 @@ function poller_worker_process() {
                // Give slower processes some processing time
                $r = q("SELECT * FROM `workerqueue`
                                WHERE `executed` <= '%s' AND `priority` > %d
-                               ORDER BY `priority`, `created` LIMIT 1",
+                               ORDER BY `priority`, `created` LIMIT 1 FOR UPDATE",
                                dbesc(NULL_DATE),
                                intval($highest_priority));
+
+               if (dbm::is_result($r)) {
+                       return $r;
+               }
        }
 
        // If there is no result (or we shouldn't pass lower processes) we check without priority limit
-       if (($highest_priority == 0) OR !dbm::is_result($r)) {
-               $r = q("SELECT * FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority`, `created` LIMIT 1", dbesc(NULL_DATE));
+       if (!dbm::is_result($r)) {
+               $r = q("SELECT * FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority`, `created` LIMIT 1 FOR UPDATE", dbesc(NULL_DATE));
        }
+
        return $r;
 }
 
+/**
+ * @brief Assigns a workerqueue entry to the current process
+ *
+ * All the checks after the update are only needed with MyISAM.
+ *
+ * @param array $queue Workerqueue entry
+ *
+ * @return boolean "true" if the claiming was successful
+ */
+function poller_claim_process($queue) {
+       $mypid = getmypid();
+
+       if (!dba::update('workerqueue', array('executed' => datetime_convert(), 'pid' => $mypid),
+                       array('id' => $queue["id"], 'pid' => 0))) {
+               logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG);
+               dba::commit();
+               return false;
+       }
+
+       // Assure that there are no tasks executed twice
+       $id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+       if (!$id) {
+               logger("Queue item ".$queue["id"]." vanished - skip this execution", LOGGER_DEBUG);
+               dba::commit();
+               return false;
+       } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
+               logger("Entry for queue item ".$queue["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
+               dba::commit();
+               return false;
+       } elseif ($id[0]["pid"] != $mypid) {
+               logger("Queue item ".$queue["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
+               dba::commit();
+               return false;
+       }
+       dba::commit();
+       return true;
+}
+
+/**
+ * @brief Removes a workerqueue entry from the current process
+ */
+function poller_unclaim_process() {
+       $mypid = getmypid();
+
+       dba::update('workerqueue', array('executed' => NULL_DATE, 'pid' => 0), array('pid' => $mypid));
+}
+
 /**
  * @brief Call the front end worker
  */
@@ -677,6 +718,8 @@ function poller_run_cron() {
 if (array_search(__file__,get_included_files())===0){
        poller_run($_SERVER["argv"],$_SERVER["argc"]);
 
+       poller_unclaim_process();
+
        get_app()->end_process();
 
        killme();