gcontact update script, rebuilt follow page, query speedup for community and network...

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 4cb6eb8d584c4516482321d25f711cd56fcec936..c681bfb3898448300578643ba2ad7ff14938bbb6 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,18 +26,22 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
-       if(function_exists('sys_getloadavg')) {
+       $load = current_load();
+       if($load) {
                $maxsysload = intval(get_config('system','maxloadavg'));
                if($maxsysload < 1)
                        $maxsysload = 50;
 
-               $load = sys_getloadavg();
-               if(intval($load[0]) > $maxsysload) {
-                       logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+               if(intval($load) > $maxsysload) {
+                       logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
                        return;
                }
        }
 
+       // Checking the number of workers
+       if (poller_too_much_workers(1))
+               return;
+
        if(($argc <= 1) OR ($argv[1] != "no_cron")) {
                // Run the cron job that calls all other jobs
                proc_run("php","include/cron.php");
@@ -52,35 +56,40 @@ function poller_run(&$argv, &$argc){
                                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
+                               /// @TODO 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
+               // 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())
+               if (poller_too_much_workers(3))
                        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);
@@ -99,19 +108,23 @@ function poller_run(&$argv, &$argc){
                $funcname=str_replace(".php", "", basename($argv[0]))."_run";
 
                if (function_exists($funcname)) {
-                       logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
+                       logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
                        $funcname($argv, $argc);
 
-                       logger("Process ".getmypid().": ".$funcname." - done");
+                       logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." - done");
 
                        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;
        }
 
 }
 
-function poller_too_much_workers() {
+function poller_too_much_workers($stage) {
 
        $queues = get_config("system", "worker_queues");
 
@@ -121,9 +134,8 @@ function poller_too_much_workers() {
        $active = poller_active_workers();
 
        // Decrease the number of workers at higher load
-       if(function_exists('sys_getloadavg')) {
-               $load = max(sys_getloadavg());
-
+       $load = current_load();
+       if($load) {
                $maxsysload = intval(get_config('system','maxloadavg'));
                if($maxsysload < 1)
                        $maxsysload = 50;
@@ -135,7 +147,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);
 
        }