Small text correction

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 9976e76db2cd619b85f171eeaa72fd2fb7721a42..d134f30d0fac270001d5cac8d9e98bc1411d81d7 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,20 +26,14 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
-       if (poller_max_connections_reached())
+       if ($a->max_processes_reached())
                return;
 
-       $load = current_load();
-       if($load) {
-               $maxsysload = intval(get_config('system','maxloadavg'));
-               if($maxsysload < 1)
-                       $maxsysload = 50;
+       if (poller_max_connections_reached())
+               return;
 
-               if(intval($load) > $maxsysload) {
-                       logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
-                       return;
-               }
-       }
+       if (App::maxload_reached())
+               return;
 
        // Checking the number of workers
        if (poller_too_much_workers(1)) {
@@ -68,6 +62,14 @@ function poller_run(&$argv, &$argc){
 
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
+               // Constantly check the number of parallel database processes
+               if ($a->max_processes_reached())
+                       return;
+
+               // Constantly check the number of available database connections to let the frontend be accessible at any time
+               if (poller_max_connections_reached())
+                       return;
+
                // Count active workers and compare them with a maximum value that depends on the load
                if (poller_too_much_workers(3))
                        return;
@@ -126,44 +128,78 @@ function poller_run(&$argv, &$argc){
  * @return bool Are more than 3/4 of the maximum connections used?
  */
 function poller_max_connections_reached() {
-       $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
-       if (!$r)
-               return false;
 
        // Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself.
-       // In that case we use the processlist to determine the current number of connections
        $max = get_config("system", "max_connections");
 
-       if ($max == 0) {
-               $max = intval($r[0]["Value"]);
-               if ($max == 0)
-                       return false;
+       // Fetch the percentage level where the poller will get active
+       $maxlevel = get_config("system", "max_connections_level");
+       if ($maxlevel == 0)
+               $maxlevel = 75;
 
-               $r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
-               if (!$r)
-                       return false;
+       if ($max == 0) {
+               // the maximum number of possible user connections can be a system variable
+               $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
+               if ($r)
+                       $max = $r[0]["Value"];
+
+               // Or it can be granted. This overrides the system variable
+               $r = q("SHOW GRANTS");
+               if ($r)
+                       foreach ($r AS $grants) {
+                               $grant = array_pop($grants);
+                               if (stristr($grant, "GRANT USAGE ON"))
+                                       if (preg_match("/WITH MAX_USER_CONNECTIONS (\d*)/", $grant, $match))
+                                               $max = $match[1];
+                       }
+       }
 
-               $connected = intval($r[0]["Value"]);
-               if ($connected == 0)
-                       return false;
-       } else {
+       // If $max is set we will use the processlist to determine the current number of connections
+       // The processlist only shows entries of the current user
+       if ($max != 0) {
                $r = q("SHOW PROCESSLIST");
                if (!$r)
                        return false;
 
-               $connected = count($r);
+               $used = count($r);
+
+               logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
+
+               $level = ($used / $max) * 100;
+
+               if ($level >= $maxlevel) {
+                       logger("Maximum level (".$maxlevel."%) of user connections reached: ".$used."/".$max);
+                       return true;
+               }
        }
 
-       $level = $connected / $max;
+       // We will now check for the system values.
+       // This limit could be reached although the user limits are fine.
+       $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
+       if (!$r)
+               return false;
 
-       logger("Connection usage: ".$connected."/".$max, LOGGER_DEBUG);
+       $max = intval($r[0]["Value"]);
+       if ($max == 0)
+               return false;
 
-       if ($level < (3/4))
+       $r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
+       if (!$r)
                return false;
 
-       logger("Maximum level (3/4) of connections reached: ".$connected."/".$max);
-       return true;
+       $used = intval($r[0]["Value"]);
+       if ($used == 0)
+               return false;
+
+       logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
+
+       $level = $used / $max * 100;
+
+       if ($level < $maxlevel)
+               return false;
 
+       logger("Maximum level (".$level."%) of system connections reached: ".$used."/".$max);
+       return true;
 }
 
 /**
@@ -172,6 +208,12 @@ function poller_max_connections_reached() {
  */
 function poller_kill_stale_workers() {
        $r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+
+       if (!dbm::is_result($r)) {
+               // No processing here needed
+               return;
+       }
+
        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",