Load depending number of workers

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 74d23a548232ce53dfd8004568cc73e9249f7a71..e33167c5b14667eba38e01b18a38e5da755ccbe5 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,28 +26,58 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
-       // Run the cron job that calls all other jobs
-       proc_run("php","include/cron.php");
+       $maxsysload = intval(get_config('system','maxloadavg'));
+       if($maxsysload < 1)
+               $maxsysload = 50;
+       if(function_exists('sys_getloadavg')) {
+               $load = sys_getloadavg();
+               if(intval($load[0]) > $maxsysload) {
+                       logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+                       return;
+               }
+       }
 
-       // Cleaning killed processes
-       $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
-       foreach($r AS $pid)
-               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"]));
+       if(($argc <= 1) OR ($argv[1] != "no_cron")) {
+               // Run the cron job that calls all other jobs
+               proc_run("php","include/cron.php");
 
-       // Checking number of workers
-       $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+               // Run the cronhooks job separately from cron for being able to use a different timing
+               proc_run("php","include/cronhooks.php");
 
-       $queues = intval(get_config("system", "worker_queues"));
+               // Cleaning dead processes
+               $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+               foreach($r AS $pid)
+                       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"]));
 
-       if ($queues == 0)
-               $queues = 4;
+       } else
+               // Sleep two seconds before checking for running processes to avoid having too many workers
+               sleep(4);
 
-       if ($workers[0]["workers"] >= $queues)
+       // Checking number of workers
+       if (poller_too_much_workers())
                return;
 
+       $starttime = time();
+
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
+
+               if(function_exists('sys_getloadavg')) {
+                       $load = sys_getloadavg();
+                       if(intval($load[0]) > $maxsysload) {
+                               logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+                               return;
+                       }
+               }
+
+               // Quit the poller once every hour
+               if (time() > ($starttime + 3600))
+                       return;
+
+               if (poller_too_much_workers())
+                       return;
+
                q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
                        dbesc(datetime_convert()),
                        intval(getmypid()),
@@ -57,8 +87,16 @@ function poller_run(&$argv, &$argc){
 
                $argc = count($argv);
 
-               // To-Do: Check for existance
-               require_once(basename($argv[0]));
+               // Check for existance and validity of the include file
+               $include = $argv[0];
+
+               if (!validate_include($include)) {
+                       logger("Include file ".$argv[0]." is not valid!");
+                       q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
+                       continue;
+               }
+
+               require_once($include);
 
                $funcname=str_replace(".php", "", basename($argv[0]))."_run";
 
@@ -69,9 +107,42 @@ function poller_run(&$argv, &$argc){
                        logger("Process ".getmypid().": ".$funcname." - done");
 
                        q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
-               }
+               } else
+                       logger("Function ".$funcname." does not exist");
+       }
+
+}
+
+function poller_too_much_workers() {
+
+       if(function_exists('sys_getloadavg')) {
+               $load = sys_getloadavg();
+
+               // To-Do
+               if ($load < 1)
+                       $queues = 10;
+               elseif ($load < 5)
+                       $queues = 4;
+               elseif ($load < 10)
+                       $queues = 2;
+               else
+                       $queues = 1;
+
+       } else {
+               $queues = intval(get_config("system", "worker_queues"));
+
+               if ($queues == 0)
+                       $queues = 4;
        }
 
+       if (poller_active_workers() >= $queues)
+               return;
+}
+
+function poller_active_workers() {
+       $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+
+       return($workers[0]["workers"]);
 }
 
 if (array_search(__file__,get_included_files())===0){