Double check for maximum number of workers

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 942fb6eafb248bd44169d2812e4a84259cfe52aa..3b348531c5b6ed47806b1fa821189bb7d0262b17 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -56,26 +56,23 @@ function poller_run(&$argv, &$argc){
                                // 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
+       } else {
+               // Checking the number of workers
+               if (poller_too_much_workers(1))
+                       return;
+
+               // Sleep four seconds before checking for running processes again to avoid having too many workers
                sleep(4);
+       }
 
        // Checking number of workers
-       if (poller_too_much_workers())
+       if (poller_too_much_workers(2))
                return;
 
        $starttime = time();
 
        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 AND `executed` = '0000-00-00 00:00:00'",
                        dbesc(datetime_convert()),
                        intval(getmypid()),
@@ -85,8 +82,10 @@ function poller_run(&$argv, &$argc){
                $id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
                        intval($r[0]["id"]),
                        intval(getmypid()));
-               if (!$id)
+               if (!$id) {
+                       logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
                        continue;
+               }
 
                $argv = json_decode($r[0]["parameter"]);
 
@@ -114,11 +113,19 @@ 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(3))
+                       return;
        }
 
 }
 
-function poller_too_much_workers() {
+function poller_too_much_workers($stage) {
 
        $queues = get_config("system", "worker_queues");
 
@@ -142,7 +149,7 @@ function poller_too_much_workers() {
                $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);
+               logger("Current load stage ".$stage.": ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
 
        }