Merge pull request #2110 from annando/1511-subscribe-feed

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index fc592d2066c35a72e382bf21e05cb842d31e0c4c..45740dab62c3ba04975a08f41b112096968c4c53 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -51,6 +51,10 @@ function poller_run(&$argv, &$argc){
                        if (!posix_kill($pid["pid"], 0))
                                q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
                                        intval($pid["pid"]));
+                       else {
+                               // To-Do: Kill long running processes
+                               // But: Update processes (like the database update) mustn't be killed
+                       }
 
        } else
                // Sleep two seconds before checking for running processes to avoid having too many workers
@@ -64,19 +68,20 @@ function poller_run(&$argv, &$argc){
 
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
-               // Quit the poller once every hour
-               if (time() > ($starttime + 3600))
-                       return;
-
-               // Count active workers and compare them with a maximum value that depends on the load
-               if (poller_too_much_workers())
-                       return;
-
-               q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
+               q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
                        dbesc(datetime_convert()),
                        intval(getmypid()),
                        intval($r[0]["id"]));
 
+               // Assure that there are no tasks executed twice
+               $id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
+                       intval($r[0]["id"]),
+                       intval(getmypid()));
+               if (!$id) {
+                       logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
+                       continue;
+               }
+
                $argv = json_decode($r[0]["parameter"]);
 
                $argc = count($argv);
@@ -103,6 +108,14 @@ function poller_run(&$argv, &$argc){
                        q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
                } else
                        logger("Function ".$funcname." does not exist");
+
+               // Quit the poller once every hour
+               if (time() > ($starttime + 3600))
+                       return;
+
+               // Count active workers and compare them with a maximum value that depends on the load
+               if (poller_too_much_workers())
+                       return;
        }
 
 }
@@ -124,7 +137,12 @@ function poller_too_much_workers() {
                if($maxsysload < 1)
                        $maxsysload = 50;
 
-               $queues = max(0, ceil($queues * (($maxsysload - $load) / $maxsysload)));
+               $maxworkers = $queues;
+
+               // Some magical mathemathics to reduce the workers
+               $exponent = 3;
+               $slope = $maxworkers / pow($maxsysload, $exponent);
+               $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
 
                logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);