Poddibility to defer worker execution

diff --git a/boot.php b/boot.php
index eda4ed1e8d9986c43f8bc702d137b38a6dd9045c..f40edaf907c932979f644bb8c611b7aca139b726 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
 define('FRIENDICA_VERSION',      '2018.12-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1285);
+define('DB_UPDATE_VERSION',      1286);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**

diff --git a/config/dbstructure.json b/config/dbstructure.json
index 443f9bd75505da9895e473dd4d210fc933d6eacc..8ea5aaa4bfb00d2ae52419f97a227e769a717b8a 100644 (file)
--- a/config/dbstructure.json
+++ b/config/dbstructure.json
@@ -1298,14 +1298,16 @@
                        "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Creation date"},
                        "pid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Process id of the worker"},
                        "executed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Execution date"},
+                       "next_try": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Next retrial date"},
+                       "retrial": {"type": "tinyint", "not null": "1", "default": "0", "comment": "Retrial counter"},
                        "done": {"type": "boolean", "not null": "1", "default": "0", "comment": "Marked 1 when the task was done - will be deleted later"}
                },
                "indexes": {
                        "PRIMARY": ["id"],
                        "pid": ["pid"],
                        "parameter": ["parameter(64)"],
-                       "priority_created": ["priority", "created"],
-                       "done_executed": ["done", "executed"]
+                       "priority_created_next_try": ["priority", "created", "next_try"],
+                       "done_executed_next_try": ["done", "executed", "next_try"]
                }
        }
 }

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index bf7e9f3bc895943a6f31c4d9c48c02893416552f..723cd809da44d3230721afd1eb4e06cf5a17ffb7 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -8,6 +8,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\BaseObject;
 
 require_once 'include/dba.php';
 
@@ -152,7 +153,8 @@ class Worker
         */
        private static function totalEntries()
        {
-               return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done`", NULL_DATE]);
+               return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
+                       NULL_DATE, DateTimeFormat::utcNow()]);
        }
 
        /**
@@ -162,7 +164,7 @@ class Worker
         */
        private static function highestPriority()
        {
-               $condition = ["`executed` <= ? AND NOT `done`", NULL_DATE];
+               $condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", NULL_DATE, DateTimeFormat::utcNow()];
                $workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
                if (DBA::isResult($workerqueue)) {
                        return $workerqueue["priority"];
@@ -180,7 +182,8 @@ class Worker
         */
        private static function processWithPriorityActive($priority)
        {
-               $condition = ["`priority` <= ? AND `executed` > ? AND NOT `done`", $priority, NULL_DATE];
+               $condition = ["`priority` <= ? AND `executed` > ? AND NOT `done` AND `next_try` < ?",
+                       $priority, NULL_DATE, DateTimeFormat::utcNow()];
                return DBA::exists('workerqueue', $condition);
        }
 
@@ -240,7 +243,7 @@ class Worker
                        self::execFunction($queue, $include, $argv, true);
 
                        $stamp = (float)microtime(true);
-                       if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
+                       if (DBA::update('workerqueue', ['done' => true], ['id' => $queue['id']])) {
                                Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
                        }
                        self::$db_duration = (microtime(true) - $stamp);
@@ -805,7 +808,8 @@ class Worker
                        $result = DBA::select(
                                'workerqueue',
                                ['id'],
-                               ["`executed` <= ? AND `priority` < ? AND NOT `done`", NULL_DATE, $highest_priority],
+                               ["`executed` <= ? AND `priority` < ? AND NOT `done` AND `next_try` < ?",
+                               NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
                                ['limit' => $limit, 'order' => ['priority', 'created']]
                        );
 
@@ -821,7 +825,8 @@ class Worker
                                $result = DBA::select(
                                        'workerqueue',
                                        ['id'],
-                                       ["`executed` <= ? AND `priority` > ? AND NOT `done`", NULL_DATE, $highest_priority],
+                                       ["`executed` <= ? AND `priority` > ? AND NOT `done` AND `next_try` < ?",
+                                       NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
                                        ['limit' => $limit, 'order' => ['priority', 'created']]
                                );
 
@@ -840,7 +845,8 @@ class Worker
                        $result = DBA::select(
                                'workerqueue',
                                ['id'],
-                               ["`executed` <= ? AND NOT `done`", NULL_DATE],
+                               ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
+                               NULL_DATE, DateTimeFormat::utcNow()],
                                ['limit' => $limit, 'order' => ['priority', 'created']]
                        );
 
@@ -1116,6 +1122,35 @@ class Worker
                return true;
        }
 
+       /**
+        * Defers the current worker entry
+        */
+       public static function defer()
+       {
+               if (empty(BaseObject::getApp()->queue)) {
+                       return;
+               }
+
+               $queue = BaseObject::getApp()->queue;
+
+               $retrial = $queue['retrial'];
+               $id = $queue['id'];
+
+               if ($retrial > 14) {
+                       logger('Id ' . $id . ' had been tried 14 times, it will be deleted now.', LOGGER_DEBUG);
+                       DBA::delete('workerqueue', ['id' => $id]);
+               }
+
+               // Calculate the delay until the next trial
+               $delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
+               $next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
+
+               logger('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG);
+
+               $fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => NULL_DATE, 'pid' => 0];
+               DBA::update('workerqueue', $fields, ['id' => $id]);
+       }
+
        /**
         * Log active processes into the "process" table
         *