Release all taken tasks on start

All taken tasks will be released after the server restart

If some tasks have been taken and don't released before shutdown
of the tarantool instance (for example: tarantool instance has been killed)
such task go to 'hung' state (noone can take the task now).
So, we must release all taken tasks on start of the queue module.

Fixes #66

Author: LeonidVas

README.md

@@ -637,6 +637,7 @@ If there are no 'ready' tasks in the queue, returns nil.
 * `tube:bury(task_id)` - buries a task
 * `tube:kick(count)` - digs out `count` tasks
 * `tube:peek(task_id)` - return the task state by ID
+* `tube:tasks_by_state(task_state)` - return the iterator to tasks in a certain state
 * `tube:truncate()` - delete all tasks from the tube. Note that `tube:truncate`
 must be called only by the user who created this tube (has space ownership) OR
 under a `setuid` function. Read more about `setuid` functions

queue/abstract.lua

@@ -511,7 +511,16 @@ function method.start()
         })
     end
 
-    _queue:pairs():each(recreate_tube)
+    for _, tube_tuple in _queue:pairs() do
+        local space_name = tube_tuple[3]
+        tube = recreate_tube(tube_tuple)
+        for _, task in tube.raw:tasks_by_state(state.TAKEN) do
+            -- Release all taken tasks on start
+            -- See https://github.com/tarantool/queue/issues/66
+            -- for more information
+            tube.raw:release(task[1])
+        end
+    end
 
     session.on_disconnect(queue._on_consumer_disconnect)
     return queue

queue/abstract/driver/fifo.lua

@@ -121,6 +121,11 @@ function method.peek(self, id)
     return self.space:get{id}
 end
 
+-- get iterator to tasks in a certain state
+function method.tasks_by_state(self, task_state)
+    return self.space.index.status:pairs(task_state)
+end
+
 function method.truncate(self)
     self.space:truncate()
 end

queue/abstract/driver/fifottl.lua

@@ -348,6 +348,11 @@ function method.peek(self, id)
     return self.space:get{id}
 end
 
+-- get iterator to tasks in a certain state
+function method.tasks_by_state(self, task_state)
+    return self.space.index.status:pairs(task_state)
+end
+
 function method.truncate(self)
     self.space:truncate()
 end

queue/abstract/driver/utube.lua

@@ -151,6 +151,11 @@ function method.peek(self, id)
     return self.space:get{id}
 end
 
+-- get iterator to tasks in a certain state
+function method.tasks_by_state(self, task_state)
+    return self.space.index.status:pairs(task_state)
+end
+
 function method.truncate(self)
     self.space:truncate()
 end

queue/abstract/driver/utubettl.lua

@@ -370,6 +370,11 @@ function method.peek(self, id)
     return self.space:get{id}
 end
 
+-- get iterator to tasks in a certain state
+function method.tasks_by_state(self, task_state)
+    return self.space.index.status:pairs(task_state)
+end
+
 function method.truncate(self)
     self.space:truncate()
 end

t/010-fifo.t

@@ -3,7 +3,7 @@ local yaml  = require('yaml')
 local fiber = require('fiber')
 
 local test = require('tap').test()
-test:plan(14)
+test:plan(15)
 
 local queue = require('queue')
 local state = require('queue.abstract.state')
@@ -292,6 +292,36 @@ test:test('if_not_exists test', function(test)
     test:isnt(tube, tube_new, "if_not_exists if tube doesn't exists")
 end)
 
+test:test('Get tasks by state test', function(test)
+    test:plan(2)
+    local tube = queue.create_tube('test_task_it', 'fifo')
+
+    for i = 1, 10 do
+        tube:put('test_data' .. tostring(i))
+    end
+    for i = 1, 4 do
+        tube:take(0.001)
+    end
+
+    local count_taken = 0
+    local count_ready = 0
+
+    for _, task in tube.raw:tasks_by_state(state.READY) do
+        if task[2] == state.READY then
+            count_ready = count_ready + 1
+        end
+    end
+
+    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
+        if task[2] == state.TAKEN then
+            count_taken = count_taken + 1
+        end
+    end
+
+    test:is(count_ready, 6, 'Check tasks count in a ready state')
+    test:is(count_taken, 4, 'Check tasks count in a taken state')
+end)
+
 tnt.finish()
 os.exit(test:check() == true and 0 or -1)
 -- vim: set ft=lua :

t/020-fifottl.t

@@ -2,7 +2,7 @@
 local fiber = require('fiber')
 
 local test = require('tap').test()
-test:plan(15)
+test:plan(16)
 
 local queue = require('queue')
 local state = require('queue.abstract.state')
@@ -262,6 +262,35 @@ test:test('buried task in a dropped queue', function(test)
     test:ok(true, 'queue does not hang')
 end)
 
+test:test('Get tasks by state test', function(test)
+    test:plan(2)
+    local tube = queue.create_tube('test_task_it', 'fifottl')
+
+    for i = 1, 10 do
+        tube:put('test_data' .. tostring(i))
+    end
+    for i = 1, 4 do
+        tube:take(0.001)
+    end
+
+    local count_taken = 0
+    local count_ready = 0
+
+    for _, task in tube.raw:tasks_by_state(state.READY) do
+        if task[2] == state.READY then
+            count_ready = count_ready + 1
+        end
+    end
+
+    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
+        if task[2] == state.TAKEN then
+            count_taken = count_taken + 1
+        end
+    end
+
+    test:is(count_ready, 6, 'Check tasks count in a ready state')
+    test:is(count_taken, 4, 'Check tasks count in a taken state')
+end)
 
 tnt.finish()
 os.exit(test:check() == true and 0 or -1)

t/030-utube.t

@@ -3,7 +3,7 @@ local yaml  = require('yaml')
 local fiber = require('fiber')
 
 local test = (require('tap')).test()
-test:plan(11)
+test:plan(12)
 
 local queue = require('queue')
 local state = require('queue.abstract.state')
@@ -156,6 +156,36 @@ test:test('if_not_exists test', function(test)
     test:isnt(tube, tube_new, "if_not_exists if tube doesn't exists")
 end)
 
+test:test('Get tasks by state test', function(test)
+    test:plan(2)
+    local tube = queue.create_tube('test_task_it', 'utube')
+
+    for i = 1, 10 do
+        tube:put('test_data' .. tostring(i), { utube = i })
+    end
+    for i = 1, 4 do
+        tube:take(0.001)
+    end
+
+    local count_taken = 0
+    local count_ready = 0
+
+    for _, task in tube.raw:tasks_by_state(state.READY) do
+        if task[2] == state.READY then
+            count_ready = count_ready + 1
+        end
+    end
+
+    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
+        if task[2] == state.TAKEN then
+            count_taken = count_taken + 1
+        end
+    end
+
+    test:is(count_ready, 6, 'Check tasks count in a ready state')
+    test:is(count_taken, 4, 'Check tasks count in a taken state')
+end)
+
 tnt.finish()
 os.exit(test:check() == true and 0 or -1)
 -- vim: set ft=lua :

t/040-utubettl.t

@@ -3,7 +3,7 @@ local yaml  = require('yaml')
 local fiber = require('fiber')
 
 local test = (require('tap')).test()
-test:plan(16)
+test:plan(17)
 
 local queue = require('queue')
 local state = require('queue.abstract.state')
@@ -257,6 +257,36 @@ test:test('ttl after delay test', function(test)
     test:is(task.ttr, TTR * 1000000, 'check TTR after release')
 end)
 
+test:test('Get tasks by state test', function(test)
+    test:plan(2)
+    local tube = queue.create_tube('test_task_it', 'utubettl')
+
+    for i = 1, 10 do
+        tube:put('test_data' .. tostring(i), { utube = i })
+    end
+    for i = 1, 4 do
+        tube:take(0.001)
+    end
+
+    local count_taken = 0
+    local count_ready = 0
+
+    for _, task in tube.raw:tasks_by_state(state.READY) do
+        if task[2] == state.READY then
+            count_ready = count_ready + 1
+        end
+    end
+
+    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
+        if task[2] == state.TAKEN then
+            count_taken = count_taken + 1
+        end
+    end
+
+    test:is(count_ready, 6, 'Check tasks count in a ready state')
+    test:is(count_taken, 4, 'Check tasks count in a taken state')
+end)
+
 tnt.finish()
 os.exit(test:check() == true and 0 or -1)
 -- vim: set ft=lua :