Merge remote-tracking branch 'upstream/develop' into user-defined-channels

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 9d1fde85c903a97847972716ae027f490df46c4d..c84b59e2b7324c5ec6838c3962706e3f306c54c9 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -362,7 +362,7 @@ class Worker
                        return false;
                }
 
-               // Check for existance and validity of the include file
+               // Check for existence and validity of the include file
                $include = $argv[0];
 
                if (method_exists(sprintf('Friendica\Worker\%s', $include), 'execute')) {
@@ -590,7 +590,7 @@ class Worker
                /* With these values we can analyze how effective the worker is.
                 * The database and rest time should be low since this is the unproductive time.
                 * The execution time is the productive time.
-                * By changing parameters like the maximum number of workers we can check the effectivness.
+                * By changing parameters like the maximum number of workers we can check the effectiveness.
                */
                $dbtotal = round(self::$db_duration, 2);
                $dbread  = round(self::$db_duration - (self::$db_duration_count + self::$db_duration_write + self::$db_duration_stat), 2);
@@ -601,7 +601,7 @@ class Worker
                $rest    = round(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 2);
                $exec    = round($duration, 2);
 
-               Logger::info('Performance:', ['state' => self::$state, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'lock' => $dblock, 'total' => $dbtotal, 'rest' => $rest, 'exec' => $exec]);
+               Logger::info('Performance:', ['function' => $funcname, 'state' => self::$state, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'lock' => $dblock, 'total' => $dbtotal, 'rest' => $rest, 'exec' => $exec]);
 
                self::coolDown();
 
@@ -622,7 +622,7 @@ class Worker
                        Logger::info('Longer than 2 minutes.', ['priority' => $queue['priority'], 'id' => $queue['id'], 'duration' => round($duration/60, 3)]);
                }
 
-               Logger::info('Process done.', ['priority' => $queue['priority'], 'id' => $queue['id'], 'duration' => round($duration, 3)]);
+               Logger::info('Process done.', ['function' => $funcname, 'priority' => $queue['priority'], 'retrial' => $queue['retrial'], 'id' => $queue['id'], 'duration' => round($duration, 3)]);
 
                DI::profiler()->saveLog(DI::logger(), 'ID ' . $queue['id'] . ': ' . $funcname);
        }
@@ -662,16 +662,24 @@ class Worker
                        DBA::close($r);
                }
 
+               $stamp = (float)microtime(true);
+               $used  = 0;
+               $sleep = 0;
+               $data = DBA::p("SHOW PROCESSLIST");
+               while ($row = DBA::fetch($data)) {
+                       if ($row['Command'] != 'Sleep') {
+                               ++$used;
+                       } else {
+                               ++$sleep;
+                       }
+               }
+               DBA::close($data);
+               self::$db_duration += (microtime(true) - $stamp);
+
                // 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) {
-                       $stamp = (float)microtime(true);
-                       $r = DBA::p('SHOW PROCESSLIST');
-                       self::$db_duration += (microtime(true) - $stamp);
-                       $used = DBA::numRows($r);
-                       DBA::close($r);
-
-                       Logger::info('Connection usage (user values)', ['usage' => $used, 'max' => $max]);
+                       Logger::info('Connection usage (user values)', ['working' => $used, 'sleeping' => $sleep, 'max' => $max]);
 
                        $level = ($used / $max) * 100;
 
@@ -695,11 +703,11 @@ class Worker
                if (!DBA::isResult($r)) {
                        return false;
                }
-               $used = intval($r['Value']);
+               $used = max($used, intval($r['Value'])) - $sleep;
                if ($used == 0) {
                        return false;
                }
-               Logger::info('Connection usage (system values)', ['used' => $used, 'max' => $max]);
+               Logger::info('Connection usage (system values)', ['working' => $used, 'sleeping' => $sleep, 'max' => $max]);
 
                $level = $used / $max * 100;
 
@@ -877,7 +885,7 @@ class Worker
        /**
         * Returns waiting jobs for the current process id
         *
-        * @return array|bool waiting workerqueue jobs or FALSE on failture
+        * @return array|bool waiting workerqueue jobs or FALSE on failure
         * @throws \Exception
         */
        private static function getWaitingJobForPID()
@@ -1357,6 +1365,17 @@ class Worker
                return $new_retrial;
        }
 
+       /**
+        * Get the number of retrials for the current worker task
+        *
+        * @return integer
+        */
+       public static function getRetrial(): int
+       {
+               $queue = DI::app()->getQueue();
+               return $queue['retrial'] ?? 0;
+       }
+
        /**
         * Defers the current worker entry
         *
@@ -1414,7 +1433,7 @@ class Worker
         */
        public static function isInMaintenanceWindow(bool $check_last_execution = false): bool
        {
-               // Calculate the seconds of the start end end of the maintenance window
+               // Calculate the seconds of the start and end of the maintenance window
                $start = strtotime(DI::config()->get('system', 'maintenance_start')) % 86400;
                $end = strtotime(DI::config()->get('system', 'maintenance_end')) % 86400;