From e20a89d494495f65b0a16ea9b97e8ce211f9658f Mon Sep 17 00:00:00 2001
From: Veniamin Gvozdikov <g.veniamin@googlemail.com>
Date: Thu, 19 Nov 2020 11:53:10 +0300
Subject: [PATCH] add iteration and full scan delays to a task

Added the ability to set iteration and full scan delays for a task.

iteration delay - max sleep time between iterations (in seconds).
full scan delay - sleep time between full scans (in seconds).

Related to #38
---
 README.md       |  2 ++
 expirationd.lua | 24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71c2ba2..d3a3b4e 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ opt
   * `args` - passed to `is_tuple_expired()` and `process_expired_tuple()` as additional context
   * `tuples_per_iteration` - number of tuples will be checked by one iteration
   * `full_scan_time` - time required for full index scan (in seconds)
+  * `iteration_delay` - max sleep time between iterations (in seconds)
+  * `full_scan_delay` - sleep time between full scans (in seconds)
   * `force` - run, even on replica
 
 ### `expirationd.kill (name)`
diff --git a/expirationd.lua b/expirationd.lua
index fc71068..4c95780 100644
--- a/expirationd.lua
+++ b/expirationd.lua
@@ -71,7 +71,7 @@ end
 
 local function suspend_basic(scan_space, task, len)
     local delay = (task.tuples_per_iteration * task.full_scan_time)
-    delay = math.min(delay / len, constants.max_delay)
+    delay = math.min(delay / len, task.iteration_delay)
     fiber.sleep(delay)
 end
 
@@ -163,8 +163,8 @@ local function worker_loop(task)
             task.do_worker_iteration(task)
         end
 
-        -- iteration is complete, yield
-        fiber.sleep(constants.max_delay)
+        -- Full scan iteration is complete, yield
+        fiber.sleep(task.full_scan_delay)
     end
 end
 
@@ -247,6 +247,8 @@ local function create_task(name)
         is_tuple_expired      = nil,
         process_expired_tuple = nil,
         args                  = nil,
+        iteration_delay                = constants.max_delay,
+        full_scan_delay                = constants.max_delay,
         tuples_per_iteration           = constants.default_tuples_per_iteration,
         full_scan_time                 = constants.default_full_scan_time,
         vinyl_assumed_space_len        = constants.default_vinyl_assumed_space_len,
@@ -293,6 +295,8 @@ end
 --                                process_expired_tuple() as additional context
 --     * tuples_per_iteration  -- number of tuples will be checked by one iteration
 --     * full_scan_time        -- time required for full index scan (in seconds)
+--     * iteration_delay       -- max sleep time between iterations (in seconds)
+--     * full_scan_delay       -- sleep time between full scans (in seconds)
 --     * force                 -- run task even on replica
 --  }
 local function expirationd_run_task(name, space_id, is_tuple_expired, options)
@@ -380,6 +384,20 @@ local function expirationd_run_task(name, space_id, is_tuple_expired, options)
         task.do_worker_iteration = default_do_worker_iteration
     end
 
+    if options.iteration_delay ~= nil then
+        if type(options.iteration_delay) ~= 'number' then
+            error("invalid type of iteration_delay value")
+        end
+        task.iteration_delay = options.iteration_delay
+    end
+
+    if options.full_scan_delay ~= nil then
+        if type(options.full_scan_delay) ~= 'number' then
+            error("invalid type of full_scan_delay value")
+        end
+        task.full_scan_delay = options.full_scan_delay
+    end
+
     -- put the task to table
     task_list[name] = task
     -- run